diff --git a/Knot.files b/Knot.files
index a0786cd5dca2647261e1674aa0682007d0ad25fc..4614e0663b302fefd29543386282afc83e5f0b11 100644
--- a/Knot.files
+++ b/Knot.files
@@ -117,9 +117,9 @@ src/knot/conf/conf.c
 src/knot/conf/conf.h
 src/knot/conf/logconf.c
 src/knot/conf/logconf.h
-src/tests/conf_tests.c
-src/tests/cuckoo_tests.c
-src/tests/da_tests.c
+src/tests/common/da_tests.c
+src/tests/common/skiplist_tests.c
+src/tests/common/slab_tests.c
 src/tests/dnslib/dnslib_dname_tests.c
 src/tests/dnslib/dnslib_edns_tests.c
 src/tests/dnslib/dnslib_node_tests.c
@@ -127,27 +127,17 @@ src/tests/dnslib/dnslib_rdata_tests.c
 src/tests/dnslib/dnslib_response_tests.c
 src/tests/dnslib/dnslib_rrset_tests.c
 src/tests/dnslib/dnslib_zone_tests.c
-src/tests/dnslib_tests.c
-src/tests/dthreads_tests.c
+src/tests/dnslib/dnslib_tests.c
+src/tests/dnslib/zonedb_tests.c
+src/tests/dnslib/cuckoo_tests.c
+src/tests/knot/dthreads_tests.c
+src/tests/knot/conf_tests.c
+src/tests/knot/server_tests.c
 src/tests/libtap/tap.c
 src/tests/libtap/tap.h
+src/tests/libtap/tap_unit.h
 src/tests/unittests_main.c
-src/tests/zonedb_tests.c
-src/tests/server_tests.c
-src/tests/skiplist_tests.c
-src/tests/slab_tests.c
-src/tests/tap_unit.h
 src/tests/template_tests.c
-src/tests/dthreads_tests.c
-src/tests/dnslib/dnslib_dname_tests.c
-src/tests/dnslib/dnslib_edns_tests.c
-src/tests/dnslib/dnslib_rdata_tests.c
-src/tests/dnslib/dnslib_rrset_tests.c
-src/tests/dnslib/dnslib_node_tests.c
-src/tests/dnslib/dnslib_response_tests.c
-src/tests/dnslib/dnslib_rrsig_set_tests.c
-src/tests/dnslib/dnslib_zone_tests.c
-src/tests/dnslib/dnslib_edns_tests.c
 tests/querytcp.c
 src/zoneparser/tests/unittests_zp_main.c
 src/zoneparser/tests/zcompile_tests.c
diff --git a/src/tests/da_tests.c b/src/tests/common/da_tests.c
similarity index 100%
rename from src/tests/da_tests.c
rename to src/tests/common/da_tests.c
diff --git a/src/tests/skiplist_tests.c b/src/tests/common/skiplist_tests.c
similarity index 100%
rename from src/tests/skiplist_tests.c
rename to src/tests/common/skiplist_tests.c
diff --git a/src/tests/slab_tests.c b/src/tests/common/slab_tests.c
similarity index 100%
rename from src/tests/slab_tests.c
rename to src/tests/common/slab_tests.c
diff --git a/src/tests/cuckoo_tests.c b/src/tests/dnslib/cuckoo_tests.c
similarity index 100%
rename from src/tests/cuckoo_tests.c
rename to src/tests/dnslib/cuckoo_tests.c
diff --git a/src/tests/dnslib_tests.c b/src/tests/dnslib/dnslib_tests.c
similarity index 100%
rename from src/tests/dnslib_tests.c
rename to src/tests/dnslib/dnslib_tests.c
diff --git a/src/tests/zonedb_tests.c b/src/tests/dnslib/zonedb_tests.c
similarity index 100%
rename from src/tests/zonedb_tests.c
rename to src/tests/dnslib/zonedb_tests.c
diff --git a/src/tests/conf_tests.c b/src/tests/knot/conf_tests.c
similarity index 100%
rename from src/tests/conf_tests.c
rename to src/tests/knot/conf_tests.c
diff --git a/src/tests/dthreads_tests.c b/src/tests/knot/dthreads_tests.c
similarity index 100%
rename from src/tests/dthreads_tests.c
rename to src/tests/knot/dthreads_tests.c
diff --git a/src/tests/server_tests.c b/src/tests/knot/server_tests.c
similarity index 100%
rename from src/tests/server_tests.c
rename to src/tests/knot/server_tests.c
diff --git a/src/tests/tap_unit.h b/src/tests/libtap/tap_unit.h
similarity index 100%
rename from src/tests/tap_unit.h
rename to src/tests/libtap/tap_unit.h