diff --git a/tests/auto/corelib/thread/qpromise/tst_qpromise.cpp b/tests/auto/corelib/thread/qpromise/tst_qpromise.cpp
index 15e51a357d4..605516de09a 100644
--- a/tests/auto/corelib/thread/qpromise/tst_qpromise.cpp
+++ b/tests/auto/corelib/thread/qpromise/tst_qpromise.cpp
@@ -559,10 +559,10 @@ static inline void testCancelWhenDestroyedWithoutStarting()
 
 void tst_QPromise::cancelWhenDestroyedWithoutStarting()
 {
-    testCancelWhenDestroyedWithoutStarting<void>();
-    testCancelWhenDestroyedWithoutStarting<int>();
-    testCancelWhenDestroyedWithoutStarting<CopyOnlyType>();
-    testCancelWhenDestroyedWithoutStarting<MoveOnlyType>();
+    RUN_TEST_FUNC(testCancelWhenDestroyedWithoutStarting<void>);
+    RUN_TEST_FUNC(testCancelWhenDestroyedWithoutStarting<int>);
+    RUN_TEST_FUNC(testCancelWhenDestroyedWithoutStarting<CopyOnlyType>);
+    RUN_TEST_FUNC(testCancelWhenDestroyedWithoutStarting<MoveOnlyType>);
 }
 
 template <typename T>
@@ -582,10 +582,10 @@ static inline void testCancelWhenDestroyedRunsContinuations()
 
 void tst_QPromise::cancelWhenDestroyedRunsContinuations()
 {
-    testCancelWhenDestroyedRunsContinuations<void>();
-    testCancelWhenDestroyedRunsContinuations<int>();
-    testCancelWhenDestroyedRunsContinuations<CopyOnlyType>();
-    testCancelWhenDestroyedRunsContinuations<MoveOnlyType>();
+    RUN_TEST_FUNC(testCancelWhenDestroyedRunsContinuations<void>);
+    RUN_TEST_FUNC(testCancelWhenDestroyedRunsContinuations<int>);
+    RUN_TEST_FUNC(testCancelWhenDestroyedRunsContinuations<CopyOnlyType>);
+    RUN_TEST_FUNC(testCancelWhenDestroyedRunsContinuations<MoveOnlyType>);
 }
 
 template <typename T>
@@ -606,10 +606,10 @@ static inline void testCancelWhenDestroyedWithFailureHandler()
 void tst_QPromise::cancelWhenDestroyedWithFailureHandler()
 {
 #ifndef QT_NO_EXCEPTIONS
-    testCancelWhenDestroyedWithFailureHandler<void>();
-    testCancelWhenDestroyedWithFailureHandler<int>();
-    testCancelWhenDestroyedWithFailureHandler<CopyOnlyType>();
-    testCancelWhenDestroyedWithFailureHandler<MoveOnlyType>();
+    RUN_TEST_FUNC(testCancelWhenDestroyedWithFailureHandler<void>);
+    RUN_TEST_FUNC(testCancelWhenDestroyedWithFailureHandler<int>);
+    RUN_TEST_FUNC(testCancelWhenDestroyedWithFailureHandler<CopyOnlyType>);
+    RUN_TEST_FUNC(testCancelWhenDestroyedWithFailureHandler<MoveOnlyType>);
 #else
     QSKIP("Exceptions are disabled, skipping the test");
 #endif
@@ -634,10 +634,10 @@ static inline void testContinuationsRunWhenFinished()
 
 void tst_QPromise::continuationsRunWhenFinished()
 {
-    testContinuationsRunWhenFinished<void>();
-    testContinuationsRunWhenFinished<int>();
-    testContinuationsRunWhenFinished<CopyOnlyType>();
-    testContinuationsRunWhenFinished<MoveOnlyType>();
+    RUN_TEST_FUNC(testContinuationsRunWhenFinished<void>);
+    RUN_TEST_FUNC(testContinuationsRunWhenFinished<int>);
+    RUN_TEST_FUNC(testContinuationsRunWhenFinished<CopyOnlyType>);
+    RUN_TEST_FUNC(testContinuationsRunWhenFinished<MoveOnlyType>);
 }
 
 void tst_QPromise::finishWhenSwapped()
@@ -716,10 +716,10 @@ void testCancelWhenMoved()
 
 void tst_QPromise::cancelWhenMoved()
 {
-    testCancelWhenMoved<void>();
-    testCancelWhenMoved<int>();
-    testCancelWhenMoved<CopyOnlyType>();
-    testCancelWhenMoved<MoveOnlyType>();
+    RUN_TEST_FUNC(testCancelWhenMoved<void>);
+    RUN_TEST_FUNC(testCancelWhenMoved<int>);
+    RUN_TEST_FUNC(testCancelWhenMoved<CopyOnlyType>);
+    RUN_TEST_FUNC(testCancelWhenMoved<MoveOnlyType>);
 }
 
 void tst_QPromise::waitUntilResumed()