diff --git a/tests/baseline/painting/CMakeLists.txt b/tests/baseline/painting/CMakeLists.txt
index 95a006da756..b32d8f13244 100644
--- a/tests/baseline/painting/CMakeLists.txt
+++ b/tests/baseline/painting/CMakeLists.txt
@@ -12,7 +12,7 @@ qt_internal_add_test(tst_baseline_painting
     SOURCES
         ../shared/baselineprotocol.cpp ../shared/baselineprotocol.h ../shared/lookup3.cpp
         ../shared/qbaselinetest.cpp ../shared/qbaselinetest.h
-        paintcommands.cpp paintcommands.h
+        ../shared/paintcommands.cpp ../shared/paintcommands.h
         tst_baseline_painting.cpp
     INCLUDE_DIRECTORIES
         ../shared
diff --git a/tests/baseline/painting/paintcommands.cpp b/tests/baseline/shared/paintcommands.cpp
similarity index 100%
rename from tests/baseline/painting/paintcommands.cpp
rename to tests/baseline/shared/paintcommands.cpp
diff --git a/tests/baseline/painting/paintcommands.h b/tests/baseline/shared/paintcommands.h
similarity index 100%
rename from tests/baseline/painting/paintcommands.h
rename to tests/baseline/shared/paintcommands.h
diff --git a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt
index f417bcc61a8..0d226411177 100644
--- a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt
+++ b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt
@@ -6,10 +6,10 @@
 
 qt_internal_add_benchmark(tst_bench_lancebench
     SOURCES
-        ../../../../baseline/painting/paintcommands.cpp ../../../../baseline/painting/paintcommands.h
+        ../../../../baseline/shared/paintcommands.cpp ../../../../baseline/shared/paintcommands.h
         tst_lancebench.cpp
     INCLUDE_DIRECTORIES
-        ../../../../baseline/painting
+        ../../../../baseline/shared
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::GuiPrivate
diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt
index edf2faa9295..3b932c3629e 100644
--- a/tests/manual/lance/CMakeLists.txt
+++ b/tests/manual/lance/CMakeLists.txt
@@ -6,13 +6,13 @@
 
 qt_internal_add_manual_test(lance
     SOURCES
-        ../../baseline/painting/paintcommands.cpp ../../baseline/painting/paintcommands.h
+        ../../baseline/shared/paintcommands.cpp ../../baseline/shared/paintcommands.h
         interactivewidget.cpp interactivewidget.h
         main.cpp
         widgets.h
     INCLUDE_DIRECTORIES
         .
-        ../../baseline/painting
+        ../../baseline/shared
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::Gui