diff --git a/g10/Makefile.am b/g10/Makefile.am
index d6fbe920b..c901198e2 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -50,8 +50,9 @@ if !HAVE_W32CE_SYSTEM
 noinst_PROGRAMS += gpgv
 endif
 if MAINTAINER_MODE
-noinst_PROGRAMS += gpgcompose $(module_tests)
+noinst_PROGRAMS += gpgcompose
 endif
+noinst_PROGRAMS += $(module_tests)
 TESTS = $(module_tests)
 
 if ENABLE_BZIP2_SUPPORT