diff --git a/src/cpp/tests/handlerenginetest.cpp b/src/cpp/tests/handlerenginetest.cpp
index 996b6dc6..cc145bc1 100644
--- a/src/cpp/tests/handlerenginetest.cpp
+++ b/src/cpp/tests/handlerenginetest.cpp
@@ -827,11 +827,17 @@ private slots:
 	}
 };
 
+namespace {
+namespace Main {
+QTEST_MAIN(HandlerEngineTest)
+}
+}
+
 extern "C" {
 
 int handlerengine_test(int argc, char **argv)
 {
-	QTEST_MAIN_IMPL(HandlerEngineTest)
+	return Main::main(argc, argv);
 }
 
 }
diff --git a/src/cpp/tests/httpheaderstest.cpp b/src/cpp/tests/httpheaderstest.cpp
index 8e755cf5..4a897a48 100644
--- a/src/cpp/tests/httpheaderstest.cpp
+++ b/src/cpp/tests/httpheaderstest.cpp
@@ -86,11 +86,17 @@ private slots:
 	}
 };
 
+namespace {
+namespace Main {
+QTEST_MAIN(HttpHeadersTest)
+}
+}
+
 extern "C" {
 
 int httpheaders_test(int argc, char **argv)
 {
-	QTEST_MAIN_IMPL(HttpHeadersTest)
+	return Main::main(argc, argv);
 }
 
 }
diff --git a/src/cpp/tests/idformattest.cpp b/src/cpp/tests/idformattest.cpp
index 28a63782..be18f26e 100644
--- a/src/cpp/tests/idformattest.cpp
+++ b/src/cpp/tests/idformattest.cpp
@@ -85,11 +85,17 @@ private slots:
 	}
 };
 
+namespace {
+namespace Main {
+QTEST_MAIN(IdFormatTest)
+}
+}
+
 extern "C" {
 
 int idformat_test(int argc, char **argv)
 {
-	QTEST_MAIN_IMPL(IdFormatTest)
+	return Main::main(argc, argv);
 }
 
 }
diff --git a/src/cpp/tests/instructtest.cpp b/src/cpp/tests/instructtest.cpp
index 2bde7e10..caa7f02c 100644
--- a/src/cpp/tests/instructtest.cpp
+++ b/src/cpp/tests/instructtest.cpp
@@ -298,11 +298,17 @@ private slots:
 	}
 };
 
+namespace {
+namespace Main {
+QTEST_MAIN(InstructTest)
+}
+}
+
 extern "C" {
 
 int instruct_test(int argc, char **argv)
 {
-	QTEST_MAIN_IMPL(InstructTest)
+	return Main::main(argc, argv);
 }
 
 }
diff --git a/src/cpp/tests/jsonpatchtest.cpp b/src/cpp/tests/jsonpatchtest.cpp
index bef6c8ba..f53701e5 100644
--- a/src/cpp/tests/jsonpatchtest.cpp
+++ b/src/cpp/tests/jsonpatchtest.cpp
@@ -96,11 +96,17 @@ private slots:
 	}
 };
 
+namespace {
+namespace Main {
+QTEST_MAIN(JsonPatchTest)
+}
+}
+
 extern "C" {
 
 int jsonpatch_test(int argc, char **argv)
 {
-	QTEST_MAIN_IMPL(JsonPatchTest)
+	return Main::main(argc, argv);
 }
 
 }
diff --git a/src/cpp/tests/jwttest.cpp b/src/cpp/tests/jwttest.cpp
index b3102914..eac72935 100644
--- a/src/cpp/tests/jwttest.cpp
+++ b/src/cpp/tests/jwttest.cpp
@@ -174,11 +174,17 @@ private slots:
 	}
 };
 
+namespace {
+namespace Main {
+QTEST_MAIN(JwtTest)
+}
+}
+
 extern "C" {
 
 int jwt_test(int argc, char **argv)
 {
-	QTEST_MAIN_IMPL(JwtTest)
+	return Main::main(argc, argv);
 }
 
 }
diff --git a/src/cpp/tests/proxyenginetest.cpp b/src/cpp/tests/proxyenginetest.cpp
index 77938aac..bf80d09b 100644
--- a/src/cpp/tests/proxyenginetest.cpp
+++ b/src/cpp/tests/proxyenginetest.cpp
@@ -1395,11 +1395,17 @@ private slots:
 	}
 };
 
+namespace {
+namespace Main {
+QTEST_MAIN(ProxyEngineTest)
+}
+}
+
 extern "C" {
 
 int proxyengine_test(int argc, char **argv)
 {
-	QTEST_MAIN_IMPL(ProxyEngineTest)
+	return Main::main(argc, argv);
 }
 
 }
diff --git a/src/cpp/tests/publishformattest.cpp b/src/cpp/tests/publishformattest.cpp
index 0e871440..2bb8c1b3 100644
--- a/src/cpp/tests/publishformattest.cpp
+++ b/src/cpp/tests/publishformattest.cpp
@@ -128,11 +128,17 @@ private slots:
 	}
 };
 
+namespace {
+namespace Main {
+QTEST_MAIN(PublishFormatTest)
+}
+}
+
 extern "C" {
 
 int publishformat_test(int argc, char **argv)
 {
-	QTEST_MAIN_IMPL(PublishFormatTest)
+	return Main::main(argc, argv);
 }
 
 }
diff --git a/src/cpp/tests/publishitemtest.cpp b/src/cpp/tests/publishitemtest.cpp
index 5bc04642..e22aad4f 100644
--- a/src/cpp/tests/publishitemtest.cpp
+++ b/src/cpp/tests/publishitemtest.cpp
@@ -94,11 +94,17 @@ private slots:
 	}
 };
 
+namespace {
+namespace Main {
+QTEST_MAIN(PublishItemTest)
+}
+}
+
 extern "C" {
 
 int publishitem_test(int argc, char **argv)
 {
-	QTEST_MAIN_IMPL(PublishItemTest)
+	return Main::main(argc, argv);
 }
 
 }
diff --git a/src/cpp/tests/routesfiletest.cpp b/src/cpp/tests/routesfiletest.cpp
index a5ae5043..053ee56f 100644
--- a/src/cpp/tests/routesfiletest.cpp
+++ b/src/cpp/tests/routesfiletest.cpp
@@ -117,11 +117,17 @@ private slots:
 	}
 };
 
+namespace {
+namespace Main {
+QTEST_MAIN(RoutesFileTest)
+}
+}
+
 extern "C" {
 
 int routesfile_test(int argc, char **argv)
 {
-	QTEST_MAIN_IMPL(RoutesFileTest)
+	return Main::main(argc, argv);
 }
 
 }
diff --git a/src/cpp/tests/templatetest.cpp b/src/cpp/tests/templatetest.cpp
index 7799ef5e..92498c6b 100644
--- a/src/cpp/tests/templatetest.cpp
+++ b/src/cpp/tests/templatetest.cpp
@@ -60,11 +60,17 @@ private slots:
 	}
 };
 
+namespace {
+namespace Main {
+QTEST_MAIN(TemplateTest)
+}
+}
+
 extern "C" {
 
 int template_test(int argc, char **argv)
 {
-	QTEST_MAIN_IMPL(TemplateTest)
+	return Main::main(argc, argv);
 }
 
 }