diff --git a/Makefile.am b/Makefile.am
index 6a6942781..54121254e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -339,3 +339,45 @@ doxygen @WITH_APIDOCS_TARGET@: Doxyfile rpmpopt-@VERSION@
 	rm -rf $@
 	$(MKDIR_P) $@
 	- [ X"@__DOXYGEN@" != Xno ] && @__DOXYGEN@
+
+check_PROGRAMS += tdbi
+tdbi_CPPFLAGS = -I$(top_srcdir)/rpmdb \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/build \
+	-I$(top_srcdir)/lib \
+	-I$(top_srcdir)/rpmio \
+	@WITH_BEECRYPT_INCLUDE@ \
+	@WITH_POPT_INCLUDE@ \
+	-I$(top_srcdir)/misc \
+	@WITH_SQLITE3_INCLUDE@ \
+	@WITH_LIBELF_INCLUDE@
+tdbi_SOURCES = rpmdb/tdbi.c
+tdbi_LDADD = rpmdb/librpmdb.la
+
+check_PROGRAMS += tjfn
+tjfn_CPPFLAGS = -I$(top_srcdir)/rpmdb \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/build \
+	-I$(top_srcdir)/lib \
+	-I$(top_srcdir)/rpmio \
+	@WITH_BEECRYPT_INCLUDE@ \
+	@WITH_POPT_INCLUDE@ \
+	-I$(top_srcdir)/misc \
+	@WITH_SQLITE3_INCLUDE@ \
+	@WITH_LIBELF_INCLUDE@
+tjfn_SOURCES = rpmdb/tjfn.c
+tjfn_LDADD = rpmdb/librpmdb.la @WITH_BEECRYPT_LIB@
+
+EXTRA_PROGRAMS = tsql
+tsql_SOURCES = rpmdb/tsql.c
+tsql_CPPFLAGS = -I$(top_srcdir)/rpmdb \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/build \
+	-I$(top_srcdir)/lib \
+	-I$(top_srcdir)/rpmio \
+	@WITH_BEECRYPT_INCLUDE@ \
+	@WITH_POPT_INCLUDE@ \
+	-I$(top_srcdir)/misc \
+	@WITH_SQLITE3_INCLUDE@ \
+	@WITH_LIBELF_INCLUDE@
+tsql_LDADD = rpmdb/librpmdb.la
diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am
index 28c52b50a..82b5bc2d8 100644
--- a/rpmdb/Makefile.am
+++ b/rpmdb/Makefile.am
@@ -14,7 +14,6 @@ AM_CPPFLAGS = -I. \
 	@WITH_LIBELF_INCLUDE@
 
 EXTRA_PROGRAMS =
-check_PROGRAMS =
 CLEANFILES =
 
 usrlibdir = $(libdir)
@@ -174,16 +173,4 @@ rpmdb_verify_LDADD = \
 	librpmdb.la
 endif
 
-check_PROGRAMS += tdbi
-tdbi_SOURCES = tdbi.c
-tdbi_LDADD = librpmdb.la
-
-check_PROGRAMS += tjfn
-tjfn_SOURCES = tjfn.c
-tjfn_LDADD = librpmdb.la @WITH_BEECRYPT_LIB@
-
-EXTRA_PROGRAMS += tsql
-tsql_SOURCES = tsql.c
-tsql_LDADD = librpmdb.la
-
 CLEANFILES += $(BUILT_SOURCES)