diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,14 +86,13 @@ EXTRA_DIST = etc/distrendaemon.conf.in \
 
 
 # tests
-TESTS=test/check_execio test/check_asprintf test/check_csv
-check_PROGRAMS=$(TESTS)
+TESTS = test/check
+check_PROGRAMS = $(TESTS)
 
-#check_execio_LIBS = $(CHECK_LIBS)
-#check_asprintf_LIBS = $(CHECK_LIBS)
-test_check_csv_LDADD = $(CHECK_LIBS) libdistrencommon.la
-test_check_execio_LDADD = $(CHECK_LIBS) libdistrencommon.la
-test_check_asprintf_LDADD = $(CHECK_LIBS) libdistrencommon.la
-test_check_csv_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
-test_check_execio_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
-test_check_asprintf_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
+test_check_LDADD = $(CHECK_LIBS) libdistrencommon.la
+test_check_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
+test_check_SOURCES = \
+	test/check.c \
+	test/check_asprintf.c test/check_asprintf.h \
+	test/check_csv.c test/check_csv.h \
+	test/check_execio.c test/check_execio.h