diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt
index 30a3206c0..25182d5f4 100644
--- a/zone/CMakeLists.txt
+++ b/zone/CMakeLists.txt
@@ -21,6 +21,13 @@ set(zone_sources
     client_mods.cpp
     client_packet.cpp
     client_process.cpp
+    cli/cli_benchmark_databuckets.cpp
+    cli/cli_sidecar_serve_http.cpp
+    cli/tests/cli_test_util.cpp
+    cli/tests/cli_databuckets.cpp
+    cli/tests/cli_npc_handins.cpp
+    cli/tests/cli_npc_handins_multiquest.cpp
+    cli/tests/cli_zone_state.cpp
     combat_record.cpp
     corpse.cpp
     doors.cpp
diff --git a/zone/cli/benchmark_databuckets.cpp b/zone/cli/cli_benchmark_databuckets.cpp
similarity index 99%
rename from zone/cli/benchmark_databuckets.cpp
rename to zone/cli/cli_benchmark_databuckets.cpp
index 65d6ead0b..d2d1dc01c 100644
--- a/zone/cli/benchmark_databuckets.cpp
+++ b/zone/cli/cli_benchmark_databuckets.cpp
@@ -1,6 +1,8 @@
 #include <chrono>
 #include <iostream>
 #include <random>
+#include "../zone_cli.h"
+#include "../../common/cli/eqemu_command_handler.h"
 #include "../../common/http/httplib.h"
 #include "../../common/eqemu_logsys.h"
 #include "../sidecar_api/sidecar_api.h"
diff --git a/zone/cli/sidecar_serve_http.cpp b/zone/cli/cli_sidecar_serve_http.cpp
similarity index 88%
rename from zone/cli/sidecar_serve_http.cpp
rename to zone/cli/cli_sidecar_serve_http.cpp
index 334ef3eff..7e82f8943 100644
--- a/zone/cli/sidecar_serve_http.cpp
+++ b/zone/cli/cli_sidecar_serve_http.cpp
@@ -1,3 +1,5 @@
+#include "../zone_cli.h"
+#include "../../common/cli/eqemu_command_handler.h"
 #include "../../common/http/httplib.h"
 #include "../../common/eqemu_logsys.h"
 #include "../sidecar_api/sidecar_api.h"
diff --git a/zone/cli/tests/databuckets.cpp b/zone/cli/tests/cli_databuckets.cpp
similarity index 97%
rename from zone/cli/tests/databuckets.cpp
rename to zone/cli/tests/cli_databuckets.cpp
index 28a3604d4..7974c06d2 100644
--- a/zone/cli/tests/databuckets.cpp
+++ b/zone/cli/tests/cli_databuckets.cpp
@@ -1,3 +1,5 @@
+#include "../../zone_cli.h"
+#include "../../common/cli/eqemu_command_handler.h"
 #include "../../common/http/httplib.h"
 #include "../../common/eqemu_logsys.h"
 #include "../../common/platform.h"
@@ -7,6 +9,10 @@
 
 extern Zone* zone;
 
+void RunTest(const std::string& test_name, const std::string& expected, const std::string& actual);
+void RunTest(const std::string& test_name, bool expected, bool actual);
+void RunTest(const std::string& test_name, int expected, int actual);
+
 void ZoneCLI::TestDataBuckets(int argc, char** argv, argh::parser& cmd, std::string& description)
 {
 	if (cmd[{"-h", "--help"}]) {
diff --git a/zone/cli/tests/npc_handins.cpp b/zone/cli/tests/cli_npc_handins.cpp
similarity index 97%
rename from zone/cli/tests/npc_handins.cpp
rename to zone/cli/tests/cli_npc_handins.cpp
index c9eed484d..da606cf23 100644
--- a/zone/cli/tests/npc_handins.cpp
+++ b/zone/cli/tests/cli_npc_handins.cpp
@@ -1,3 +1,5 @@
+#include "../../zone_cli.h"
+#include "../../common/cli/eqemu_command_handler.h"
 #include "../../common/http/httplib.h"
 #include "../../common/eqemu_logsys.h"
 #include "../../common/platform.h"
@@ -9,6 +11,10 @@
 extern Zone *zone;
 using json = nlohmann::json;
 
+void RunTest(const std::string& test_name, const std::string& expected, const std::string& actual);
+void RunTest(const std::string& test_name, bool expected, bool actual);
+void RunTest(const std::string& test_name, int expected, int actual);
+
 struct HandinEntry {
 	std::string            item_id            = "0";
 	uint32                 count              = 0;
diff --git a/zone/cli/tests/npc_handins_multiquest.cpp b/zone/cli/tests/cli_npc_handins_multiquest.cpp
similarity index 93%
rename from zone/cli/tests/npc_handins_multiquest.cpp
rename to zone/cli/tests/cli_npc_handins_multiquest.cpp
index 1c560cdc9..faaffb765 100644
--- a/zone/cli/tests/npc_handins_multiquest.cpp
+++ b/zone/cli/tests/cli_npc_handins_multiquest.cpp
@@ -1,3 +1,5 @@
+#include "../../zone_cli.h"
+#include "../../common/cli/eqemu_command_handler.h"
 #include "../../common/eqemu_logsys.h"
 #include "../../common/platform.h"
 #include "../../zone.h"
@@ -6,6 +8,10 @@
 
 extern Zone *zone;
 
+void RunTest(const std::string& test_name, const std::string& expected, const std::string& actual);
+void RunTest(const std::string& test_name, bool expected, bool actual);
+void RunTest(const std::string& test_name, int expected, int actual);
+
 void ZoneCLI::TestNpcHandinsMultiQuest(int argc, char **argv, argh::parser &cmd, std::string &description)
 {
 	if (cmd[{"-h", "--help"}]) {
diff --git a/zone/cli/tests/_test_util.cpp b/zone/cli/tests/cli_test_util.cpp
similarity index 81%
rename from zone/cli/tests/_test_util.cpp
rename to zone/cli/tests/cli_test_util.cpp
index 0bd118166..3f6e7fe2e 100644
--- a/zone/cli/tests/_test_util.cpp
+++ b/zone/cli/tests/cli_test_util.cpp
@@ -1,6 +1,6 @@
 #include "../../zone.h"
 
-inline void RunTest(const std::string &test_name, const std::string &expected, const std::string &actual)
+void RunTest(const std::string &test_name, const std::string &expected, const std::string &actual)
 {
 	if (expected == actual) {
 		std::cout << "[✅] " << test_name << " PASSED\n";
@@ -12,7 +12,7 @@ inline void RunTest(const std::string &test_name, const std::string &expected, c
 	}
 }
 
-inline void RunTest(const std::string &test_name, bool expected, bool actual)
+void RunTest(const std::string &test_name, bool expected, bool actual)
 {
 	if (expected == actual) {
 		std::cout << "[✅] " << test_name << " PASSED\n";
@@ -25,7 +25,7 @@ inline void RunTest(const std::string &test_name, bool expected, bool actual)
 	}
 }
 
-inline void RunTest(const std::string &test_name, int expected, int actual)
+void RunTest(const std::string &test_name, int expected, int actual)
 {
 	if (expected == actual) {
 		std::cout << "[✅] " << test_name << " PASSED\n";
@@ -40,7 +40,7 @@ inline void RunTest(const std::string &test_name, int expected, int actual)
 
 extern Zone *zone;
 
-inline void SetupZone(std::string zone_short_name, uint32 instance_id = 0) {
+void SetupZone(std::string zone_short_name, uint32 instance_id = 0) {
 	EQEmuLogSys::Instance()->SilenceConsoleLogging();
 
 	EQEmuLogSys::Instance()->log_settings[Logs::ZoneState].log_to_console = std::getenv("DEBUG") ? 3 : 0;
diff --git a/zone/cli/tests/zone_state.cpp b/zone/cli/tests/cli_zone_state.cpp
similarity index 98%
rename from zone/cli/tests/zone_state.cpp
rename to zone/cli/tests/cli_zone_state.cpp
index b527f5a4f..235891fa5 100644
--- a/zone/cli/tests/zone_state.cpp
+++ b/zone/cli/tests/cli_zone_state.cpp
@@ -1,11 +1,18 @@
-extern Zone *zone;
-
+#include "../../zone_cli.h"
+#include "../../common/cli/eqemu_command_handler.h"
 #include <cereal/archives/json.hpp>
 #include <cereal/types/map.hpp>
 #include "../../common/repositories/npc_types_repository.h"
 #include "../../corpse.h"
 #include "../../../common/repositories/respawn_times_repository.h"
 
+extern Zone* zone;
+
+void RunTest(const std::string& test_name, const std::string& expected, const std::string& actual);
+void RunTest(const std::string& test_name, bool expected, bool actual);
+void RunTest(const std::string& test_name, int expected, int actual);
+void SetupZone(std::string zone_short_name, uint32 instance_id = 0);
+
 inline void ClearState()
 {
 	ZoneStateSpawnsRepository::DeleteWhere(database, "zone_id = 32 and instance_id = 0");
diff --git a/zone/zone_cli.cpp b/zone/zone_cli.cpp
index 33177e8f6..59ddee18d 100644
--- a/zone/zone_cli.cpp
+++ b/zone/zone_cli.cpp
@@ -39,13 +39,3 @@ void ZoneCLI::CommandHandler(int argc, char **argv)
 	EQEmuCommand::HandleMenu(function_map, cmd, argc, argv);
 }
 
-// cli
-#include "cli/benchmark_databuckets.cpp"
-#include "cli/sidecar_serve_http.cpp"
-
-// tests
-#include "cli/tests/_test_util.cpp"
-#include "cli/tests/databuckets.cpp"
-#include "cli/tests/npc_handins.cpp"
-#include "cli/tests/npc_handins_multiquest.cpp"
-#include "cli/tests/zone_state.cpp"