diff --git a/tests/Makefile.am b/tests/Makefile.am
index 14f7bef..153922b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,14 @@
 AUTOMAKE_OPTIONS    = dejagnu
 export DEJAGNU
+DEJATOOL =
 
-SUBDIRS =
+SUBDIRS = bgpd.tests
 
 EXTRA_DIST = \
 	config/unix.exp \
+	lib/bgpd.exp \
 	global-conf.exp
 
-DEJATOOL =
-
 INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
 DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
 
@@ -17,6 +17,7 @@
 
 if BGPD
 TESTS_BGPD = aspathtest testbgpcap ecommtest testbgpmpattr testbgpmpath
+DEJATOOL += bgpd
 else
 TESTS_BGPD =
 endif