diff --git a/lib/dns/tests/Atffile b/lib/dns/tests/Atffile
index c3e044f41a..039f19cf83 100644
--- a/lib/dns/tests/Atffile
+++ b/lib/dns/tests/Atffile
@@ -2,4 +2,28 @@ Content-Type: application/X-atf-atffile; version="1"
 
 prop: test-suite = bind9
 
-tp-glob: *_test
+tp: acl_test
+tp: db_test
+tp: dbdiff_test
+tp: dbiterator_test
+tp: dbversion_test
+tp: dh_test
+tp: dispatch_test
+tp: geoip_test
+tp: gost_test
+tp: master_test
+tp: name_test
+tp: nsec3_test
+tp: peer_test
+tp: private_test
+tp: rbt_serialize_test
+tp: rbt_test
+tp: rdata_test
+tp: rdataset_test
+tp: rdatasetstats_test
+tp: rsa_test
+tp: time_test
+tp: tsig_test
+tp: update_test
+tp: zonemgr_test
+tp: zt_test
diff --git a/lib/irs/tests/Atffile b/lib/irs/tests/Atffile
index c3e044f41a..90f6d601e8 100644
--- a/lib/irs/tests/Atffile
+++ b/lib/irs/tests/Atffile
@@ -2,4 +2,4 @@ Content-Type: application/X-atf-atffile; version="1"
 
 prop: test-suite = bind9
 
-tp-glob: *_test
+tp: resconf_test
diff --git a/lib/isc/tests/Atffile b/lib/isc/tests/Atffile
index c3e044f41a..3c6f4fba8a 100644
--- a/lib/isc/tests/Atffile
+++ b/lib/isc/tests/Atffile
@@ -2,4 +2,24 @@ Content-Type: application/X-atf-atffile; version="1"
 
 prop: test-suite = bind9
 
-tp-glob: *_test
+tp: aes_test
+tp: counter_test
+tp: errno_test
+tp: hash_test
+tp: lex_test
+tp: mem_test
+tp: netaddr_test
+tp: parse_test
+tp: pool_test
+tp: print_test
+tp: queue_test
+tp: radix_test
+tp: ratelimit_test
+tp: regex_test
+tp: safe_test
+tp: sockaddr_test
+tp: socket_test
+tp: symtab_test
+tp: task_test
+tp: taskpool_test
+tp: time_test
diff --git a/lib/lwres/tests/Atffile b/lib/lwres/tests/Atffile
index c3e044f41a..69a7ebaf6a 100644
--- a/lib/lwres/tests/Atffile
+++ b/lib/lwres/tests/Atffile
@@ -2,4 +2,4 @@ Content-Type: application/X-atf-atffile; version="1"
 
 prop: test-suite = bind9
 
-tp-glob: *_test
+tp: config_test