diff --git a/Makefile.am b/Makefile.am
index ff98ab54..8b006c3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,13 @@ src_iwd_LDADD = ell/libell-internal.la
 client_iwctl_SOURCES = client/main.c
 client_iwctl_LDADD = ell/libell-internal.la
 
-noinst_PROGRAMS = unit/test-pbkdf2-sha1 unit/test-prf-sha1
+noinst_PROGRAMS =
+
+unit_tests = unit/test-pbkdf2-sha1 unit/test-prf-sha1
+
+if MAINTAINER_MODE
+noinst_PROGRAMS += $(unit_tests)
+endif
 
 unit_test_pbkdf2_sha1_SOURCES = unit/test-pbkdf2-sha1.c \
 					src/sha1.h src/sha1.c
@@ -46,7 +52,7 @@ unit_test_prf_sha1_SOURCES = unit/test-prf-sha1.c \
 					src/sha1.h src/sha1.c
 unit_test_prf_sha1_LDADD = ell/libell-internal.la
 
-TESTS = $(noinst_PROGRAMS)
+TESTS = $(unit_tests)
 
 AM_CFLAGS = -fvisibility=hidden