diff --git a/CMakeLists.txt b/CMakeLists.txt
index 499ea9b..a8e5096 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,7 +215,7 @@ target_compile_options(test_http_handler PRIVATE -UNDEBUG)
 add_test(NAME test_http_handler COMMAND test_http_handler)
 
 # Register with CTest
-add_test(NAME metric_tests COMMAND test_metric)
+add_test(NAME test_metric COMMAND test_metric)
 
 add_executable(bench_arena benchmarks/bench_arena.cpp)
 target_link_libraries(bench_arena nanobench_impl weaseldb_sources)
@@ -255,8 +255,8 @@ target_link_libraries(debug_arena weaseldb_sources)
 add_executable(load_tester tools/load_tester.cpp)
 target_link_libraries(load_tester Threads::Threads llhttp_static perfetto)
 
-add_test(NAME arena_tests COMMAND test_arena)
-add_test(NAME commit_request_tests COMMAND test_commit_request)
+add_test(NAME test_arena COMMAND test_arena)
+add_test(NAME test_commit_request COMMAND test_commit_request)
 add_test(NAME arena_benchmarks COMMAND bench_arena)
 add_test(NAME commit_request_benchmarks COMMAND bench_commit_request)
 add_test(NAME parser_comparison_benchmarks COMMAND bench_parser_comparison)
@@ -266,14 +266,14 @@ add_test(NAME format_comparison_benchmarks COMMAND bench_format_comparison)
 add_executable(test_api_url_parser tests/test_api_url_parser.cpp)
 target_link_libraries(test_api_url_parser doctest_impl weaseldb_sources_debug)
 target_compile_options(test_api_url_parser PRIVATE -UNDEBUG)
-add_test(NAME api_url_parser_tests COMMAND test_api_url_parser)
+add_test(NAME test_api_url_parser COMMAND test_api_url_parser)
 
 # Reference counting tests and benchmarks
 add_executable(test_reference tests/test_reference.cpp)
 target_link_libraries(test_reference doctest_impl)
 target_include_directories(test_reference PRIVATE src)
 target_compile_options(test_reference PRIVATE -UNDEBUG)
-add_test(NAME reference_tests COMMAND test_reference)
+add_test(NAME test_reference COMMAND test_reference)
 
 add_executable(bench_reference benchmarks/bench_reference.cpp)
 target_link_libraries(bench_reference doctest_impl nanobench_impl