--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,15 +1,6 @@
 
-noinst_PROGRAMS = csstest #dvd_region
+noinst_PROGRAMS = dvdcss_test
 
-csstest_SOURCES = csstest.c
-csstest_LDADD = $(top_builddir)/src/libdvdcss.la $(bsdi_libadd)
-csstest_CFLAGS = -I$(top_srcdir)/src
+dvdcss_test_SOURCES = dvdcss_test.c
+dvdcss_test_LDADD = $(top_builddir)/dvdcss/libdvdcss.la -ldl
 
-#dvd_region_SOURCES = dvd_region.c
-#dvd_region_LDADD = $(top_builddir)/src/libdvdcss.la
-#dvd_region_CFLAGS = -I$(top_srcdir)/src
-
-if SYS_BSDI_LIBDVD
-bsdi_libadd = -ldvd
-endif
-