diff --git a/lib/hdb/Makefile.am b/lib/hdb/Makefile.am
index c92853ae7..c5128e77d 100644
--- a/lib/hdb/Makefile.am
+++ b/lib/hdb/Makefile.am
@@ -60,7 +60,7 @@ if versionscript
 libhdb_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map
 endif
 
-noinst_PROGRAMS = test_dbinfo
+noinst_PROGRAMS = test_dbinfo test_hdbkeys
 
 dist_libhdb_la_SOURCES =			\
 	common.c				\
@@ -108,10 +108,10 @@ hdb_asn1_files: ../asn1/asn1_compile$(EXEEXT) $(srcdir)/hdb.asn1
 
 $(libhdb_la_OBJECTS): hdb_asn1.h hdb_err.h
 
-test_dbinfo_SOURCES = test_dbinfo.c
-
 test_dbinfo_LIBS = libhdb.la
 
+test_hdbkeys_LIBS = ../krb5/libkrb5.la libhdb.la
+
 # to help stupid solaris make
 
 hdb_err.h: hdb_err.et