diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am
index 254dee997..53e163c52 100644
--- a/kadmin/Makefile.am
+++ b/kadmin/Makefile.am
@@ -54,6 +54,12 @@ kadmind_SOURCES =				\
 
 add_random_users_SOURCES = add-random-users.c
 
+test_util_SOURCES = test_util.c util.c
+
+TESTS = test_util
+
+check_PROGRAMS = $(TESTS)
+
 LDADD_common = \
 	$(top_builddir)/lib/hdb/libhdb.la \
 	$(LIB_openldap) \
@@ -82,4 +88,6 @@ add_random_users_LDADD = \
 	$(LDADD_common) \
 	$(LIB_dlopen)
 
+test_util_LDADD = $(kadmin_LDADD)
+
 EXTRA_DIST = $(man_MANS) kadmin-commands.in