diff --git a/Makefile.am b/Makefile.am
index 8d626660..c523aca8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-SUBDIRS = . sample
+SUBDIRS = . sample test
 
 EXTRA_DIST = acconfig.h test/Makefile.in compat/err.h compat/sys/queue.h \
              compat/sys/tree.h compat/sys/_time.h
diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 00000000..6380c9d6
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,40 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+
+LDADD = -L.. -levent
+CPPFPLAGS = -I.. 
+CFLAGS = -I../compat
+
+noinst_PROGRAMS = test-eof test-weof test-time
+
+test_eof_sources = test-eof.c
+test_weof_sources = test-weof.c
+test_time_sources = test-time.c
+
+DISTCLEANFILES = *~
+
+all:	test
+
+test: $(noinst_PROGRAMS)
+	@echo "Running tests:"
+	@echo -n " test-eof: "
+	@if ./test-eof >/dev/null ; \
+	then \
+		echo OKAY ; \
+	else \
+		echo FAILED ; \
+	fi
+	@echo -n " test-weof: "
+	@if ./test-weof >/dev/null ; \
+	then \
+		echo OKAY ; \
+	else \
+		echo FAILED ; \
+	fi
+	@echo -n " test-time: "
+	@if ./test-time >/dev/null ; \
+	then \
+		echo OKAY ; \
+	else \
+		echo FAILED ; \
+	fi
+