diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ libdistrencommon_la_SOURCES = src/common
 	src/common/multiio.c src/common/multiio.h \
 	src/common/options.c src/common/options.h \
 	src/common/protocol.c src/common/protocol.h \
+	src/common/csv.c src/common/csv.h \
 	src/common/remoteio.h \
 	src/common/remoteio.c src/common/libremoteio.h \
 	src/common/request.c src/common/request.h
@@ -85,13 +86,14 @@ EXTRA_DIST = etc/distrendaemon.conf.in \
 
 
 # tests
-TESTS=test/check_execio test/check_asprintf
+TESTS=test/check_execio test/check_asprintf test/check_csv
 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)
-