diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 8c52d636960..5c4bd672f46 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1221,6 +1221,13 @@ class WatchDog : public QThread
         return false;
     }
 
+    void setExpectation(Expectation e)
+    {
+        const auto locker = qt_scoped_lock(mutex);
+        expecting.store(e, std::memory_order_relaxed);
+        waitCondition.notify_all();
+    }
+
 public:
     WatchDog()
     {
@@ -1233,26 +1240,18 @@ public:
 
     ~WatchDog()
     {
-        {
-            const auto locker = qt_scoped_lock(mutex);
-            expecting.store(ThreadEnd, std::memory_order_relaxed);
-            waitCondition.notify_all();
-        }
+        setExpectation(ThreadEnd);
         wait();
     }
 
     void beginTest()
     {
-        const auto locker = qt_scoped_lock(mutex);
-        expecting.store(TestFunctionEnd, std::memory_order_relaxed);
-        waitCondition.notify_all();
+        setExpectation(TestFunctionEnd);
     }
 
     void testFinished()
     {
-        const auto locker = qt_scoped_lock(mutex);
-        expecting.store(TestFunctionStart, std::memory_order_relaxed);
-        waitCondition.notify_all();
+        setExpectation(TestFunctionStart);
     }
 
     void run() override