diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index 44c186937c..8f185728c3 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -94,11 +94,6 @@ TESTS +=		\
 	rpzrecurse
 endif HAVE_PERLMOD_NET_DNS
 
-if HAVE_LIBNGHTTP2
-TESTS +=		\
-	doth
-endif
-
 TESTS +=			\
 	acl			\
 	additional		\
@@ -120,6 +115,8 @@ TESTS +=			\
 	dispatch		\
 	dlzexternal		\
 	dns64			\
+	dnstap			\
+	doth			\
 	dsdigest		\
 	dupsigs			\
 	dyndb			\
@@ -155,6 +152,7 @@ TESTS +=			\
 	notify			\
 	nsec3			\
 	nslookup		\
+	nzd2nzf			\
 	padding			\
 	pending			\
 	pipelined		\
@@ -191,10 +189,6 @@ TESTS +=			\
 	xferquota		\
 	zonechecks
 
-if HAVE_LMDB
-TESTS += nzd2nzf
-endif # HAVE_LMDB
-
 if HAVE_PERLMOD_NET_DNS
 
 TESTS +=		\
@@ -207,10 +201,6 @@ TESTS +=		\
 	upforwd		\
 	zero
 
-if HAVE_DNSTAP
-TESTS += dnstap
-endif
-
 if HAVE_PERLMOD_FILE_FETCH
 TESTS += statschannel
 endif HAVE_PERLMOD_FILE_FETCH