diff --git a/tests/src/3d/testqgs3drendering.cpp b/tests/src/3d/testqgs3drendering.cpp
index 0047ebf95bee..b45a1d71a4fb 100644
--- a/tests/src/3d/testqgs3drendering.cpp
+++ b/tests/src/3d/testqgs3drendering.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 #include "qgstest.h"
-#include "qgsrenderchecker.h"
+#include "qgsmultirenderchecker.h"
 
 #include "qgsproject.h"
 #include "qgsrasterlayer.h"
@@ -208,12 +208,12 @@ bool TestQgs3DRendering::renderCheck( const QString &testName, QImage &image, in
   QString myTmpDir = QDir::tempPath() + '/';
   QString myFileName = myTmpDir + testName + ".png";
   image.save( myFileName, "PNG" );
-  QgsRenderChecker myChecker;
+  QgsMultiRenderChecker myChecker;
   myChecker.setControlPathPrefix( QStringLiteral( "3d" ) );
   myChecker.setControlName( "expected_" + testName );
   myChecker.setRenderedImage( myFileName );
   myChecker.setColorTolerance( 2 );  // color tolerance < 2 was failing polygon3d_extrusion test
-  bool myResultFlag = myChecker.compareImages( testName, mismatchCount );
+  bool myResultFlag = myChecker.runTest( testName, mismatchCount );
   mReport += myChecker.report();
   return myResultFlag;
 }
diff --git a/tests/testdata/control_images/3d/expected_dem_terrain_1/expected_dem_terrain_1_mask.png b/tests/testdata/control_images/3d/expected_dem_terrain_1/expected_dem_terrain_1_mask.png
new file mode 100644
index 000000000000..8197d1134f86
Binary files /dev/null and b/tests/testdata/control_images/3d/expected_dem_terrain_1/expected_dem_terrain_1_mask.png differ
diff --git a/tests/testdata/control_images/3d/expected_mesh3d/default/expected_mesh3d.png b/tests/testdata/control_images/3d/expected_mesh3d/default/expected_mesh3d.png
new file mode 100644
index 000000000000..6e720daa394c
Binary files /dev/null and b/tests/testdata/control_images/3d/expected_mesh3d/default/expected_mesh3d.png differ
diff --git a/tests/testdata/control_images/3d/expected_mesh3d/fedora/expected_mesh3d.png b/tests/testdata/control_images/3d/expected_mesh3d/fedora/expected_mesh3d.png
new file mode 100644
index 000000000000..b52acd2d4716
Binary files /dev/null and b/tests/testdata/control_images/3d/expected_mesh3d/fedora/expected_mesh3d.png differ
diff --git a/tests/testdata/control_images/3d/expected_polygon3d_extrusion/expected_polygon3d_extrusion.png b/tests/testdata/control_images/3d/expected_polygon3d_extrusion/default/expected_polygon3d_extrusion.png
similarity index 100%
rename from tests/testdata/control_images/3d/expected_polygon3d_extrusion/expected_polygon3d_extrusion.png
rename to tests/testdata/control_images/3d/expected_polygon3d_extrusion/default/expected_polygon3d_extrusion.png
diff --git a/tests/testdata/control_images/3d/expected_polygon3d_extrusion/fedora/expected_polygon3d_extrusion.png b/tests/testdata/control_images/3d/expected_polygon3d_extrusion/fedora/expected_polygon3d_extrusion.png
new file mode 100644
index 000000000000..756de366d013
Binary files /dev/null and b/tests/testdata/control_images/3d/expected_polygon3d_extrusion/fedora/expected_polygon3d_extrusion.png differ
diff --git a/tests/testdata/control_images/3d/expected_rulebased/default/expected_rulebased.png b/tests/testdata/control_images/3d/expected_rulebased/default/expected_rulebased.png
new file mode 100644
index 000000000000..313907f6531a
Binary files /dev/null and b/tests/testdata/control_images/3d/expected_rulebased/default/expected_rulebased.png differ
diff --git a/tests/testdata/control_images/3d/expected_rulebased/fedora/expected_rulebased.png b/tests/testdata/control_images/3d/expected_rulebased/fedora/expected_rulebased.png
new file mode 100644
index 000000000000..247af27974ae
Binary files /dev/null and b/tests/testdata/control_images/3d/expected_rulebased/fedora/expected_rulebased.png differ