Index: trunk/Nebulous/nebclient/tests/Makefile.am
===================================================================
--- trunk/Nebulous/nebclient/tests/Makefile.am	(revision 4622)
+++ trunk/Nebulous/nebclient/tests/Makefile.am	(revision 12649)
@@ -1,6 +1,13 @@
+SUBDIRS = tap
+
 TESTS = tests
 
+AM_CPPFLAGS = \
+    -I$(top_srcdir)/tests/tap/src \
+    -I$(top_srcdir)/src
+
+AM_LDFLAGS = \
+    $(top_builddir)/tests/tap/src/libtap.la \
+    $(top_builddir)/src/libnebclient.la
+
 check_PROGRAMS = tests
-tests_SOURCES = tests.c
-tests_CPPFLAGS = -I$(top_srcdir)/src$
-tests_LDADD = $(top_builddir)/src/libnebclient.la