2 files changed, 7 insertions, 2 deletions

diff --git a/regress/Makefile b/regress/Makefile
index 1c02aa819..c920661ae 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.76 2015/01/18 22:00:18 djm Exp $
+#       $OpenBSD: Makefile,v 1.77 2015/01/20 22:58:57 djm Exp $
 
 REGRESS_TARGETS=        unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec
 tests:          $(REGRESS_TARGETS)
@@ -205,4 +205,6 @@ unit:
                 ${.OBJDIR}/unittests/sshbuf/test_sshbuf ; \
                 ${.OBJDIR}/unittests/sshkey/test_sshkey \
                         -d  ${.CURDIR}//unittests/sshkey/testdata ; \
+                ${.OBJDIR}/unittests/bitmap/test_bitmap ; \
+                ${.OBJDIR}/unittests/kex/test_kex ; \
         fi
diff --git a/regress/unittests/test_helper/Makefile b/regress/unittests/test_helper/Makefile
index 3e90903ef..5b3894cbf 100644
--- a/regress/unittests/test_helper/Makefile
+++ b/regress/unittests/test_helper/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.1 2014/04/30 05:32:00 djm Exp $
+#       $OpenBSD: Makefile,v 1.2 2015/01/20 22:58:57 djm Exp $
 
 LIB=    test_helper
 SRCS=   test_helper.c fuzz.c
@@ -7,6 +7,9 @@ DEBUGLIBS= no
 NOPROFILE= yes
 NOPIC=  yes
 
+# Hack to allow building with SUBDIR in ../../Makefile
+regress: all
+
 install:
         @echo -n