diff --git a/bin/tests/system/Makefile.am b/bin/tests/system/Makefile.am
index ea4d13a934..56daf105d6 100644
--- a/bin/tests/system/Makefile.am
+++ b/bin/tests/system/Makefile.am
@@ -67,27 +67,82 @@ wire_test_LDADD =		\
 	$(LIBDNS_LIBS)
 endif HAVE_DNSTAP
 
-TESTS = \
-	acl additional addzone allow-query auth autosign \
-	builtin cacheclean case catz cds \
-	checkconf checknames checkzone \
-	cookie database dlz dlzexternal \
-	dns64 dscp dsdigest dyndb \
-	ednscompliance emptyzones \
-	filter-aaaa formerr \
-	geoip2 glue idna inline integrity keepalive \
-	legacy limits logfileconfig \
-	masterfile masterformat metadata mirror mkeys \
-	names notify nslookup \
-	padding pending \
-	redirect rndc rootkeysentinel rpz \
-	rrchecker rrl rrsetorder rsabigexponent runtime \
-	sfcache smartsign sortlist \
-	spf staticstub stub synthfromdnssec \
-	tools tsig tsiggss \
-	unknown verify views wildcard \
-	xferquota zonechecks \
-	ecdsa tkey
+TESTS = 			\
+	acl			\
+	additional		\
+	addzone			\
+	allow-query		\
+	auth			\
+	autosign		\
+	builtin			\
+	cacheclean		\
+	case			\
+	catz			\
+	cds			\
+	checkconf		\
+	checknames		\
+	checkzone		\
+	cookie			\
+	database		\
+	dlz			\
+	dlzexternal		\
+	dns64			\
+	dscp			\
+	dsdigest		\
+	dyndb			\
+	ecdsa			\
+	ednscompliance		\
+	emptyzones		\
+	filter-aaaa		\
+	formerr			\
+	geoip2			\
+	glue			\
+	idna			\
+	include-multiplecfg 	\
+	inline			\
+	integrity		\
+	kasp			\
+	keepalive		\
+	legacy			\
+	limits			\
+	logfileconfig		\
+	masterfile		\
+	masterformat		\
+	metadata		\
+	mirror			\
+	mkeys			\
+	names			\
+	notify			\
+	nslookup		\
+	padding			\
+	pending			\
+	redirect		\
+	rndc			\
+	rootkeysentinel		\
+	rpz			\
+	rrchecker		\
+	rrl			\
+	rrsetorder		\
+	rsabigexponent		\
+	runtime			\
+	sfcache			\
+	smartsign		\
+	sortlist		\
+	spf			\
+	staticstub		\
+	stub			\
+	synthfromdnssec		\
+	tkey			\
+	tools			\
+	tsig			\
+	tsiggss			\
+	ttl			\
+	unknown			\
+	verify			\
+	views			\
+	wildcard		\
+	xferquota		\
+	zonechecks
 
 # eddsa test is broken
 # TESTS += eddsa
@@ -105,7 +160,6 @@ endif # HAVE_LMDB
 if HAVE_PERLMOD_NET_DNS
 
 TESTS +=		\
-	zero		\
 	digdelv		\
 	dnssec		\
 	fetchlimit	\
@@ -115,7 +169,8 @@ TESTS +=		\
 	resolver	\
 	rpzrecurse	\
 	statistics	\
-	upforwd
+	upforwd		\
+	zero
 
 if HAVE_DNSTAP
 TESTS += dnstap
@@ -155,6 +210,10 @@ endif HAVE_PYMOD_DNS
 
 endif HAVE_PYTHON
 
+if HAVE_PKCS11
+TESTS += pkcs11
+endif
+
 else !HAVE_PERL
 check:
 	echo Perl is not available, no tests were ran
diff --git a/doc/dev/dev.md b/doc/dev/dev.md
index ba4f530721..7dfef18ced 100644
--- a/doc/dev/dev.md
+++ b/doc/dev/dev.md
@@ -153,8 +153,13 @@ To run only the system tests, omitting unit tests:
         $ cd bin/tests/system
         $ sh runall.sh
 
-Or, to run an individual system test:
+To run an individual system test:
 
+        $ make -C bin/tests/system/ check TESTS=<testname> V=1
+
+Or:
+
+        $ TESTS= make -e all check
         $ cd bin/tests/system
         $ sh run.sh <testname>