diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index aafc7176..315ca70e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,40 +6,40 @@ find_package(Boost COMPONENTS filesystem unit_test_framework system REQUIRED)
 
 set(TEST_SOURCES
     main.cpp
-    test_globals.cpp
-    test_animation.cpp
-    test_archive.cpp
-    test_buoyancy.cpp
-    test_character.cpp
-    test_chase.cpp
-    test_cutscene.cpp
-    test_config.cpp
-    test_data.cpp
+    test_Globals.cpp
+    test_Animation.cpp
+    test_Archive.cpp
+    test_Buoyancy.cpp
+    test_Character.cpp
+    test_Chase.cpp
+    test_Cutscene.cpp
+    test_Config.cpp
+    test_Data.cpp
     test_FileIndex.cpp
     test_GameData.cpp
     test_GameWorld.cpp
-    test_globals.hpp
-    test_items.cpp
+    test_Globals.hpp
+    test_Items.cpp
     test_Input.cpp
-    test_lifetime.cpp
-    test_loaderdff.cpp
+    test_Lifetime.cpp
+    test_Loaderdff.cpp
     test_LoaderIPL.cpp
     test_Logger.cpp
-    test_menu.cpp
-    test_object.cpp
-    test_object_data.cpp
-    test_pickup.cpp
-    test_renderer.cpp
-    test_rwbstream.cpp
+    test_Menu.cpp
+    test_Object.cpp
+    test_ObjectData.cpp
+    test_Pickup.cpp
+    test_Renderer.cpp
+    test_RWBStream.cpp
     test_SaveGame.cpp
-    test_scriptmachine.cpp
-    test_state.cpp
-    test_text.cpp
-    test_trafficdirector.cpp
-    test_vehicle.cpp
+    test_ScriptMachine.cpp
+    test_State.cpp
+    test_Text.cpp
+    test_TrafficDirector.cpp
+    test_Vehicle.cpp
     test_VisualFX.cpp
-    test_weapon.cpp
-    test_world.cpp
+    test_Weapon.cpp
+    test_World.cpp
     test_ZoneData.cpp
 
     # Hack in rwgame sources until there's a per-target test suite
diff --git a/tests/main.cpp b/tests/main.cpp
index 94d98bca..045b507e 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE openrw
 #include <boost/test/included/unit_test.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 std::ostream& operator<<(std::ostream& stream, const glm::vec3& v) {
     stream << v.x << " " << v.y << " " << v.z;
diff --git a/tests/test_animation.cpp b/tests/test_Animation.cpp
similarity index 97%
rename from tests/test_animation.cpp
rename to tests/test_Animation.cpp
index e1c66809..3a51d710 100644
--- a/tests/test_animation.cpp
+++ b/tests/test_Animation.cpp
@@ -2,7 +2,7 @@
 #include <data/Clump.hpp>
 #include <engine/Animator.hpp>
 #include <glm/gtx/string_cast.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(AnimationTests)
 
diff --git a/tests/test_archive.cpp b/tests/test_Archive.cpp
similarity index 96%
rename from tests/test_archive.cpp
rename to tests/test_Archive.cpp
index b6b35d0b..69a32da4 100644
--- a/tests/test_archive.cpp
+++ b/tests/test_Archive.cpp
@@ -1,6 +1,6 @@
 #include <boost/test/unit_test.hpp>
 #include <loaders/LoaderIMG.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(ArchiveTests)
 
diff --git a/tests/test_buoyancy.cpp b/tests/test_Buoyancy.cpp
similarity index 98%
rename from tests/test_buoyancy.cpp
rename to tests/test_Buoyancy.cpp
index 0839f7e3..64dd4351 100644
--- a/tests/test_buoyancy.cpp
+++ b/tests/test_Buoyancy.cpp
@@ -1,6 +1,6 @@
 #include <boost/test/unit_test.hpp>
 #include <objects/VehicleObject.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(BuoyancyTests)
 
diff --git a/tests/test_character.cpp b/tests/test_Character.cpp
similarity index 99%
rename from tests/test_character.cpp
rename to tests/test_Character.cpp
index 829b4c80..d88e7c02 100644
--- a/tests/test_character.cpp
+++ b/tests/test_Character.cpp
@@ -3,7 +3,7 @@
 #include <engine/Animator.hpp>
 #include <objects/CharacterObject.hpp>
 #include <objects/VehicleObject.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(CharacterTests)
 
diff --git a/tests/test_chase.cpp b/tests/test_Chase.cpp
similarity index 94%
rename from tests/test_chase.cpp
rename to tests/test_Chase.cpp
index 49163bdd..3f9c7b91 100644
--- a/tests/test_chase.cpp
+++ b/tests/test_Chase.cpp
@@ -1,6 +1,6 @@
 #include <boost/test/unit_test.hpp>
 #include <data/Chase.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(ChaseTests)
 
diff --git a/tests/test_config.cpp b/tests/test_Config.cpp
similarity index 100%
rename from tests/test_config.cpp
rename to tests/test_Config.cpp
diff --git a/tests/test_cutscene.cpp b/tests/test_Cutscene.cpp
similarity index 96%
rename from tests/test_cutscene.cpp
rename to tests/test_Cutscene.cpp
index 343ad78c..0b0f5cbc 100644
--- a/tests/test_cutscene.cpp
+++ b/tests/test_Cutscene.cpp
@@ -1,7 +1,7 @@
 #include <boost/test/unit_test.hpp>
 #include <data/CutsceneData.hpp>
 #include <loaders/LoaderCutsceneDAT.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(CutsceneTests)
 
diff --git a/tests/test_data.cpp b/tests/test_Data.cpp
similarity index 99%
rename from tests/test_data.cpp
rename to tests/test_Data.cpp
index 3b9d674e..cf191d92 100644
--- a/tests/test_data.cpp
+++ b/tests/test_Data.cpp
@@ -3,7 +3,7 @@
 #include <loaders/GenericDATLoader.hpp>
 #include <objects/PickupObject.hpp>
 #include <objects/InstanceObject.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 // Tests against loading various data files
 // These tests are bad but so are the interfaces so it cancels out.
diff --git a/tests/test_FileIndex.cpp b/tests/test_FileIndex.cpp
index e5da50e2..d5fb4403 100644
--- a/tests/test_FileIndex.cpp
+++ b/tests/test_FileIndex.cpp
@@ -1,6 +1,6 @@
 #include <boost/test/unit_test.hpp>
 #include <platform/FileIndex.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(FileIndexTests)
 
diff --git a/tests/test_GameData.cpp b/tests/test_GameData.cpp
index 9b83eb8f..6fe44c93 100644
--- a/tests/test_GameData.cpp
+++ b/tests/test_GameData.cpp
@@ -1,6 +1,6 @@
 #include <boost/test/unit_test.hpp>
 #include <engine/GameData.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(GameDataTests)
 
diff --git a/tests/test_GameWorld.cpp b/tests/test_GameWorld.cpp
index dc7ba6f1..4a1130f1 100644
--- a/tests/test_GameWorld.cpp
+++ b/tests/test_GameWorld.cpp
@@ -2,7 +2,7 @@
 #include <engine/GameData.hpp>
 #include <engine/GameWorld.hpp>
 #include <objects/InstanceObject.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(GameWorldTests)
 
diff --git a/tests/test_globals.cpp b/tests/test_Globals.cpp
similarity index 84%
rename from tests/test_globals.cpp
rename to tests/test_Globals.cpp
index 68f200d4..f0424167 100644
--- a/tests/test_globals.cpp
+++ b/tests/test_Globals.cpp
@@ -1,4 +1,4 @@
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 #include <GameConfig.hpp>
 
diff --git a/tests/test_globals.hpp b/tests/test_Globals.hpp
similarity index 100%
rename from tests/test_globals.hpp
rename to tests/test_Globals.hpp
diff --git a/tests/test_items.cpp b/tests/test_Items.cpp
similarity index 96%
rename from tests/test_items.cpp
rename to tests/test_Items.cpp
index 0e0d3050..a7a1b4f6 100644
--- a/tests/test_items.cpp
+++ b/tests/test_Items.cpp
@@ -1,6 +1,6 @@
 #include <boost/test/unit_test.hpp>
 #include <objects/CharacterObject.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(ItemTests)
 
diff --git a/tests/test_lifetime.cpp b/tests/test_Lifetime.cpp
similarity index 96%
rename from tests/test_lifetime.cpp
rename to tests/test_Lifetime.cpp
index 8cdec744..b702c7fa 100644
--- a/tests/test_lifetime.cpp
+++ b/tests/test_Lifetime.cpp
@@ -2,7 +2,7 @@
 #include <glm/gtx/string_cast.hpp>
 #include <objects/InstanceObject.hpp>
 #include <render/ViewCamera.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(LifetimeTests)
 
diff --git a/tests/test_LoaderIPL.cpp b/tests/test_LoaderIPL.cpp
index 45685a65..8c764835 100644
--- a/tests/test_LoaderIPL.cpp
+++ b/tests/test_LoaderIPL.cpp
@@ -1,6 +1,6 @@
 #include <boost/test/unit_test.hpp>
 #include <loaders/LoaderIPL.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(LoaderIPLTests)
 
diff --git a/tests/test_loaderdff.cpp b/tests/test_Loaderdff.cpp
similarity index 98%
rename from tests/test_loaderdff.cpp
rename to tests/test_Loaderdff.cpp
index a0d2b30d..8c9f4617 100644
--- a/tests/test_loaderdff.cpp
+++ b/tests/test_Loaderdff.cpp
@@ -1,6 +1,6 @@
 #include <boost/test/unit_test.hpp>
 #include <data/Clump.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(LoaderDFFTests)
 
diff --git a/tests/test_menu.cpp b/tests/test_Menu.cpp
similarity index 100%
rename from tests/test_menu.cpp
rename to tests/test_Menu.cpp
diff --git a/tests/test_object.cpp b/tests/test_Object.cpp
similarity index 97%
rename from tests/test_object.cpp
rename to tests/test_Object.cpp
index 11eadc3f..90eaeb33 100644
--- a/tests/test_object.cpp
+++ b/tests/test_Object.cpp
@@ -1,7 +1,7 @@
 #include <boost/test/unit_test.hpp>
 #include <engine/GameWorld.hpp>
 #include <objects/InstanceObject.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(ObjectUnitTests)
 
diff --git a/tests/test_object_data.cpp b/tests/test_ObjectData.cpp
similarity index 98%
rename from tests/test_object_data.cpp
rename to tests/test_ObjectData.cpp
index 738c5cc9..e11cebff 100644
--- a/tests/test_object_data.cpp
+++ b/tests/test_ObjectData.cpp
@@ -1,6 +1,6 @@
 #include <boost/test/unit_test.hpp>
 #include <data/ModelData.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(ObjectDataTests)
 
diff --git a/tests/test_pickup.cpp b/tests/test_Pickup.cpp
similarity index 98%
rename from tests/test_pickup.cpp
rename to tests/test_Pickup.cpp
index e7dc6950..a2b820d5 100644
--- a/tests/test_pickup.cpp
+++ b/tests/test_Pickup.cpp
@@ -3,7 +3,7 @@
 #include <objects/CharacterObject.hpp>
 #include <objects/ItemPickup.hpp>
 #include <objects/PickupObject.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 class TestPickup : public PickupObject {
 public:
diff --git a/tests/test_rwbstream.cpp b/tests/test_RWBStream.cpp
similarity index 96%
rename from tests/test_rwbstream.cpp
rename to tests/test_RWBStream.cpp
index f1ab4d69..d25120e5 100644
--- a/tests/test_rwbstream.cpp
+++ b/tests/test_RWBStream.cpp
@@ -1,6 +1,6 @@
 #include <boost/test/unit_test.hpp>
 #include <loaders/RWBinaryStream.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(RWBStreamTests)
 
diff --git a/tests/test_renderer.cpp b/tests/test_Renderer.cpp
similarity index 100%
rename from tests/test_renderer.cpp
rename to tests/test_Renderer.cpp
diff --git a/tests/test_SaveGame.cpp b/tests/test_SaveGame.cpp
index 36d2642d..be48d6c9 100644
--- a/tests/test_SaveGame.cpp
+++ b/tests/test_SaveGame.cpp
@@ -3,7 +3,7 @@
 #include <engine/SaveGame.hpp>
 #include <script/ScriptMachine.hpp>
 
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 #if 0  // Disabled until we make a start on saving the game
 BOOST_AUTO_TEST_SUITE(SaveGameTests)
diff --git a/tests/test_scriptmachine.cpp b/tests/test_ScriptMachine.cpp
similarity index 100%
rename from tests/test_scriptmachine.cpp
rename to tests/test_ScriptMachine.cpp
diff --git a/tests/test_state.cpp b/tests/test_State.cpp
similarity index 100%
rename from tests/test_state.cpp
rename to tests/test_State.cpp
diff --git a/tests/test_text.cpp b/tests/test_Text.cpp
similarity index 99%
rename from tests/test_text.cpp
rename to tests/test_Text.cpp
index 6a833812..3ce4237f 100644
--- a/tests/test_text.cpp
+++ b/tests/test_Text.cpp
@@ -2,7 +2,7 @@
 #include <data/GameTexts.hpp>
 #include <engine/ScreenText.hpp>
 #include <loaders/LoaderGXT.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 #define T(x) GameStringUtil::fromString(x)
 
diff --git a/tests/test_trafficdirector.cpp b/tests/test_TrafficDirector.cpp
similarity index 99%
rename from tests/test_trafficdirector.cpp
rename to tests/test_TrafficDirector.cpp
index a2ea1821..a0e1a14e 100644
--- a/tests/test_trafficdirector.cpp
+++ b/tests/test_TrafficDirector.cpp
@@ -1,5 +1,5 @@
 #include <boost/test/unit_test.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 #include <ai/AIGraph.hpp>
 #include <ai/TrafficDirector.hpp>
diff --git a/tests/test_vehicle.cpp b/tests/test_Vehicle.cpp
similarity index 99%
rename from tests/test_vehicle.cpp
rename to tests/test_Vehicle.cpp
index a50dedc7..ed84aa26 100644
--- a/tests/test_vehicle.cpp
+++ b/tests/test_Vehicle.cpp
@@ -1,7 +1,7 @@
 #include <boost/test/unit_test.hpp>
 #include <data/Clump.hpp>
 #include <objects/VehicleObject.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(VehicleTests)
 
diff --git a/tests/test_weapon.cpp b/tests/test_Weapon.cpp
similarity index 99%
rename from tests/test_weapon.cpp
rename to tests/test_Weapon.cpp
index a5a97474..3cf6f958 100644
--- a/tests/test_weapon.cpp
+++ b/tests/test_Weapon.cpp
@@ -2,7 +2,7 @@
 #include <data/WeaponData.hpp>
 #include <objects/CharacterObject.hpp>
 #include <objects/ProjectileObject.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(WeaponTests)
 
diff --git a/tests/test_world.cpp b/tests/test_World.cpp
similarity index 100%
rename from tests/test_world.cpp
rename to tests/test_World.cpp
diff --git a/tests/test_ZoneData.cpp b/tests/test_ZoneData.cpp
index 8a2d9cfa..7568dfae 100644
--- a/tests/test_ZoneData.cpp
+++ b/tests/test_ZoneData.cpp
@@ -1,6 +1,6 @@
 #include <boost/test/unit_test.hpp>
 #include <data/ZoneData.hpp>
-#include "test_globals.hpp"
+#include "test_Globals.hpp"
 
 BOOST_AUTO_TEST_SUITE(ZoneDataTests)