diff --git a/source/graphics/tests/test_LOSTexture.h b/source/graphics/tests/test_LOSTexture.h
index ea1658a027..40329c0f90 100644
--- a/source/graphics/tests/test_LOSTexture.h
+++ b/source/graphics/tests/test_LOSTexture.h
@@ -65,7 +65,7 @@ public:
 		TS_ASSERT_EQUALS(losData[0], 104);
 	}
 
-	void test_perf_DISABLED()
+	void DISABLED_test_perf()
 	{
 		CSimulation2 sim{nullptr, *g_ScriptContext, nullptr};
 		CLOSTexture tex(sim);
diff --git a/source/network/tests/test_Net.h b/source/network/tests/test_Net.h
index be96e0d824..7155a4e738 100644
--- a/source/network/tests/test_Net.h
+++ b/source/network/tests/test_Net.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2022 Wildfire Games.
+/* Copyright (C) 2024 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -127,7 +127,10 @@ public:
 		}
 	}
 
-	void test_basic_DISABLED()
+	// just so that cxxtestgen doesn't complain "No tests defined" if all are disabled
+	void test_dummy() {}
+
+	void DISABLED_test_basic()
 	{
 		// This doesn't actually test much, it just runs a very quick multiplayer game
 		// and prints a load of debug output so you can see if anything funny's going on
@@ -209,7 +212,7 @@ public:
 		wait(clients, 100);
 	}
 
-	void test_rejoin_DISABLED()
+	void DISABLED_test_rejoin()
 	{
 		ScriptInterface scriptInterface("Engine", "Test", g_ScriptContext);
 		ScriptRequest rq(scriptInterface);
diff --git a/source/network/tests/test_StunClient.h b/source/network/tests/test_StunClient.h
index e50cfe5746..2df83c3e9e 100644
--- a/source/network/tests/test_StunClient.h
+++ b/source/network/tests/test_StunClient.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2022 Wildfire Games.
+/* Copyright (C) 2024 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -62,7 +62,7 @@ public:
 			TS_FAIL("StunClient::FindLocalIP did not return a valid IPV4 address: wrong separators");
 	}
 
-	void test_stun_DISABLED()
+	void DISABLED_test_stun()
 	{
 		// Disabled test -> should return your external IP by connecting to our STUN server.
 		CConfigDB::Initialise();
diff --git a/source/ps/tests/test_Hashing.h b/source/ps/tests/test_Hashing.h
index 7911e87497..2400baa561 100644
--- a/source/ps/tests/test_Hashing.h
+++ b/source/ps/tests/test_Hashing.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2024 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -47,7 +47,7 @@ public:
 		TS_ASSERT_EQUALS(HashCryptographically("D9895FDEE287DBEE19907B7329207F388B1708AC4A123CA537603E953885B20F", "foobar"), "8CE4D45113D5A682FE4B6F185C1880F83EEA6CB2F007E815DCA5BF4B8178ECD0");
 	}
 
-	void test_hash_perf_DISABLED()
+	void DISABLED_test_hash_perf()
 	{
 		double t = timer_Time();
 		for (size_t i = 0; i < 100; ++i)
diff --git a/source/simulation2/components/tests/test_Pathfinder.h b/source/simulation2/components/tests/test_Pathfinder.h
index 93b73a2a81..a40b2592f7 100644
--- a/source/simulation2/components/tests/test_Pathfinder.h
+++ b/source/simulation2/components/tests/test_Pathfinder.h
@@ -133,7 +133,7 @@ public:
 		}
 	}
 
-	void test_performance_DISABLED()
+	void DISABLED_test_performance()
 	{
 		CTerrain terrain;
 
@@ -191,7 +191,7 @@ public:
 		printf("[%f]", t);
 	}
 
-	void test_performance_short_DISABLED()
+	void DISABLED_test_performance_short()
 	{
 		CTerrain terrain;
 		terrain.Initialize(5, NULL);
@@ -247,7 +247,7 @@ public:
 		}
 	}
 
-	void test_perf2_DISABLED()
+	void DISABLED_test_perf2()
 	{
 		CTerrain terrain;
 
@@ -304,7 +304,7 @@ public:
 		stream << "</svg>\n";
 	}
 
-	void test_perf3_DISABLED()
+	void DISABLED_test_perf3()
 	{
 		CTerrain terrain;
 
diff --git a/source/simulation2/tests/test_CmpTemplateManager.h b/source/simulation2/tests/test_CmpTemplateManager.h
index 9e1506f884..6ec8820d6b 100644
--- a/source/simulation2/tests/test_CmpTemplateManager.h
+++ b/source/simulation2/tests/test_CmpTemplateManager.h
@@ -237,7 +237,7 @@ public:
 	}
 
 	// This just attempts loading every public entity, to check there's no validation errors
-	void test_load_all_DISABLED() // disabled since it's a bit slow and noisy
+	void DISABLED_test_load_all() // disabled since it's a bit slow and noisy
 	{
 		CTerrain dummy;
 		CSimulation2 sim{nullptr, *g_ScriptContext, &dummy};
diff --git a/source/simulation2/tests/test_EntityMap.h b/source/simulation2/tests/test_EntityMap.h
index 7ddf54e54b..8f5a4b71b5 100644
--- a/source/simulation2/tests/test_EntityMap.h
+++ b/source/simulation2/tests/test_EntityMap.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019 Wildfire Games.
+/* Copyright (C) 2024 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -190,7 +190,7 @@ public:
 		TS_ASSERT(test.find(30) == test.end());
 	}
 
-	void test_perf_DISABLED()
+	void DISABLE_test_perf()
 	{
 		EntityMap<int> test;
 		printf("Testing performance of EntityMap\n");
diff --git a/source/simulation2/tests/test_Serializer.h b/source/simulation2/tests/test_Serializer.h
index c91851bd89..da91ea67ef 100644
--- a/source/simulation2/tests/test_Serializer.h
+++ b/source/simulation2/tests/test_Serializer.h
@@ -843,7 +843,7 @@ public:
 class TestSerializerPerf : public CxxTest::TestSuite
 {
 public:
-	void test_script_props_DISABLED()
+	void DISABLED_test_script_props()
 	{
 		const char* input = "var x = {}; for (var i=0;i<256;++i) x[i]=Math.pow(i, 2); x";
 
@@ -877,7 +877,7 @@ public:
 		}
 	}
 
-	void test_hash_DISABLED()
+	void DISABLED_test_hash()
 	{
 		CXeromyces::Startup();
 
diff --git a/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h b/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h
index b834dad75f..8fb4a2f1d7 100644
--- a/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h
+++ b/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2024 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -262,7 +262,7 @@ public:
 			"#line 1\n\n\t\n\n\n\t\n\t\n\n\n\t\n\t\n\t\n\t\n\tvec3 color();\n\t\n#line 5\n\t42 256");
 	}
 
-	void test_performance_DISABLED()
+	void DISABLED_test_performance()
 	{
 		CPreprocessorWrapper::IncludeRetrieverCallback includeCallback = [](
 			const CStr& includePath, CStr& out) {