diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5187830bd6..bef123beeb 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -41,6 +41,8 @@ add_subdirectory(perf)
 #   seastar test framework.
 # * BOOST - a unit test that only depends on the listed sources and the
 #   Boost test framework
+# * UNIT - a test driven its own main(). and it depends on the
+#   seastar test framework.
 # test_name should map to a source file, such that ${test_name}.cc
 # is a valid source file. If this isn't the case, please use the SOURCE
 # param.
@@ -82,6 +84,12 @@ function(add_scylla_test name)
       PRIVATE
         Boost::unit_test_framework
         Boost::dynamic_linking)
+  elseif(kind STREQUAL "UNIT")
+    target_link_libraries(${name}
+      PRIVATE
+        Seastar::seastar_testing)
+  else()
+    message(FATAL_ERROR "unknown test KIND: ${kind}")
   endif()
   if(parsed_args_LIBRARIES)
     target_link_libraries(${name}
@@ -92,4 +100,6 @@ endfunction()
 
 if(BUILD_TESTING)
     add_subdirectory(boost)
+    add_subdirectory(manual)
+    add_subdirectory(unit)
 endif()
diff --git a/test/boost/CMakeLists.txt b/test/boost/CMakeLists.txt
index f2124abca9..c4293e98b9 100644
--- a/test/boost/CMakeLists.txt
+++ b/test/boost/CMakeLists.txt
@@ -34,6 +34,9 @@ add_scylla_test(compress_test
 add_scylla_test(cql_auth_syntax_test
   KIND BOOST
   LIBRARIES cql3)
+add_scylla_test(cql_query_test
+  KIND SEASTAR
+  LIBRARIES cql3)
 add_scylla_test(crc_test
   KIND BOOST)
 add_scylla_test(data_listeners_test
diff --git a/test/manual/CMakeLists.txt b/test/manual/CMakeLists.txt
new file mode 100644
index 0000000000..2f0d645dae
--- /dev/null
+++ b/test/manual/CMakeLists.txt
@@ -0,0 +1,21 @@
+add_scylla_test(ec2_snitch_test
+  KIND SEASTAR)
+add_scylla_test(enormous_table_scan_test
+  KIND SEASTAR)
+add_scylla_test(gce_snitch_test
+  KIND SEASTAR)
+add_scylla_test(gossip
+  KIND SEASTAR)
+add_scylla_test(manual_hint_test
+  SOURCES hint_test.cc
+  KIND SEASTAR)
+add_scylla_test(message
+  KIND SEASTAR)
+add_scylla_test(partition_data_test
+  KIND SEASTAR)
+add_scylla_test(row_locker_test
+  KIND SEASTAR)
+add_scylla_test(sstable_scan_footprint_test
+  KIND SEASTAR)
+add_scylla_test(streaming_histogram_test
+  KIND SEASTAR)
diff --git a/test/perf/CMakeLists.txt b/test/perf/CMakeLists.txt
index 2758432ac9..45e0a7246e 100644
--- a/test/perf/CMakeLists.txt
+++ b/test/perf/CMakeLists.txt
@@ -33,6 +33,23 @@ target_link_libraries(perf-lib
   PRIVATE
     xxHash::xxhash)
 
+add_perf_test(logalloc)
+add_perf_test(memory_footprint_test)
+add_perf_test(perf_big_decimal
+  LIBRARIES
+    mutation
+    schema)
+add_perf_test(perf_cache_eviction)
+add_perf_test(perf_checksum)
+add_perf_test(perf_collection)
+add_perf_test(perf_cql_parser
+  LIBRARIES
+    cql3)
+add_perf_test(perf_hash)
+add_perf_test(perf_idl
+  LIBRARIES
+    idl)
+add_perf_test(perf_mutation)
 add_perf_test(perf_mutation_readers
   LIBRARIES
     auth
@@ -45,13 +62,6 @@ add_perf_test(perf_mutation_readers
     service
     types
     utils)
-add_perf_test(perf_checksum)
 add_perf_test(perf_mutation_fragment)
-add_perf_test(perf_idl
-  LIBRARIES
-    idl)
 add_perf_test(perf_vint)
-add_perf_test(perf_big_decimal
-  LIBRARIES
-    mutation
-    schema)
+add_perf_test(perf_row_cache_reads)
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
new file mode 100644
index 0000000000..4dad1bdc48
--- /dev/null
+++ b/test/unit/CMakeLists.txt
@@ -0,0 +1,22 @@
+add_scylla_test(bptree_compaction_test
+  KIND UNIT)
+add_scylla_test(bptree_stress_test
+  KIND UNIT)
+add_scylla_test(btree_compaction_test
+  KIND UNIT)
+add_scylla_test(btree_stress_test
+  KIND UNIT)
+add_scylla_test(cross_shard_barrier_test
+  KIND UNIT)
+add_scylla_test(lsa_sync_eviction_test
+  KIND UNIT)
+add_scylla_test(lsa_async_eviction_test
+  KIND UNIT)
+add_scylla_test(radix_tree_stress_test
+  KIND UNIT)
+add_scylla_test(radix_tree_compaction_test
+  KIND UNIT)
+add_scylla_test(row_cache_alloc_stress_test
+  KIND UNIT)
+add_scylla_test(row_cache_stress_test
+  KIND UNIT)