diff --git a/tests/controls/gridtest.cpp b/tests/controls/gridtest.cpp
index 97557eb5bc..a77f2ad39d 100644
--- a/tests/controls/gridtest.cpp
+++ b/tests/controls/gridtest.cpp
@@ -534,8 +534,10 @@ TEST_CASE_METHOD(GridTestCase, "Grid::ReorderedColumnsCellClick", "[grid]")
     wxYield();
 
     sim.MouseClick();
-    wxYield();
-
+    if ( !WaitForEventAt(point, "mouse click to be processed", [&]() {
+            return click.GetCount() != 0;
+        }) )
+        return;
     CHECK(click.GetCount() == 1);
 #endif
 }