diff --git a/tests/controls/gridtest.cpp b/tests/controls/gridtest.cpp
index 9077e02726..5921793b82 100644
--- a/tests/controls/gridtest.cpp
+++ b/tests/controls/gridtest.cpp
@@ -26,7 +26,7 @@
     #include "wx/stopwatch.h"
 #endif // __WXGTK__
 
-#include "waitforpaint.h"
+#include "waitfor.h"
 
 // To disable tests which work locally, but not when run on GitHub CI.
 #if defined(__WXGTK__) && !defined(__WXGTK3__)
diff --git a/tests/graphics/clipper.cpp b/tests/graphics/clipper.cpp
index 0ab95b3f19..697169c446 100644
--- a/tests/graphics/clipper.cpp
+++ b/tests/graphics/clipper.cpp
@@ -23,7 +23,7 @@
 #include "wx/window.h"
 
 #include "testfile.h"
-#include "waitforpaint.h"
+#include "waitfor.h"
 
 static const wxSize s_dcSize(260, 300);
 
diff --git a/tests/graphics/clippingbox.cpp b/tests/graphics/clippingbox.cpp
index d5da29af1a..249f4d85a2 100644
--- a/tests/graphics/clippingbox.cpp
+++ b/tests/graphics/clippingbox.cpp
@@ -22,7 +22,7 @@
 #include "wx/dcclient.h"
 
 #include "testfile.h"
-#include "waitforpaint.h"
+#include "waitfor.h"
 
 #include <memory>
 
diff --git a/tests/waitforpaint.h b/tests/waitfor.h
similarity index 94%
rename from tests/waitforpaint.h
rename to tests/waitfor.h
index 0a1891901b..88a95ab838 100644
--- a/tests/waitforpaint.h
+++ b/tests/waitfor.h
@@ -1,13 +1,13 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        tests/waitforpaint.h
+// Name:        tests/waitfor.h
 // Purpose:     Helper WaitForPaint class
 // Author:      Vadim Zeitlin
 // Created:     2019-10-17 (extracted from tests/window/setsize.cpp)
 // Copyright:   (c) 2019 Vadim Zeitlin <vadim@wxwidgets.org>
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_TESTS_WAITFORPAINT_H_
-#define _WX_TESTS_WAITFORPAINT_H_
+#ifndef _WX_TESTS_WAITFOR_H_
+#define _WX_TESTS_WAITFOR_H_
 
 #include "wx/stopwatch.h"
 #include "wx/window.h"
@@ -99,4 +99,4 @@ public:
 
 #endif // __WXGTK__/!__WXGTK__
 
-#endif // _WX_TESTS_WAITFORPAINT_H_
+#endif // _WX_TESTS_WAITFOR_H_
diff --git a/tests/window/clientsize.cpp b/tests/window/clientsize.cpp
index 61f2b87cec..9d2da0380d 100644
--- a/tests/window/clientsize.cpp
+++ b/tests/window/clientsize.cpp
@@ -21,7 +21,7 @@
 #include <memory>
 
 #include "asserthelper.h"
-#include "waitforpaint.h"
+#include "waitfor.h"
 
 // ----------------------------------------------------------------------------
 // tests themselves
diff --git a/tests/window/setsize.cpp b/tests/window/setsize.cpp
index d30fb22fdb..e89516fa05 100644
--- a/tests/window/setsize.cpp
+++ b/tests/window/setsize.cpp
@@ -22,7 +22,7 @@
 #include <memory>
 
 #include "asserthelper.h"
-#include "waitforpaint.h"
+#include "waitfor.h"
 
 // ----------------------------------------------------------------------------
 // tests helpers