diff --git a/tests/src/analysis/testqgsprocessingalgspt1.cpp b/tests/src/analysis/testqgsprocessingalgspt1.cpp
index b32374b5e6c3..574b8ec05014 100644
--- a/tests/src/analysis/testqgsprocessingalgspt1.cpp
+++ b/tests/src/analysis/testqgsprocessingalgspt1.cpp
@@ -1351,11 +1351,11 @@ void TestQgsProcessingAlgsPt1::flattenRelations()
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "B52" ) << 3 << QStringLiteral( "B52" ) << 0LL << 10.0 << 2 << 1 << 3 << QStringLiteral( "Point (-103 23)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "B52" ) << 3 << QStringLiteral( "B52" ) << 12LL << 10.0 << 1 << 1 << 2 << QStringLiteral( "Point (-103 23)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "B52" ) << 3 << QStringLiteral( "B52" ) << 34LL << 10.0 << 2 << 1 << 3 << QStringLiteral( "Point (-103 23)" ) ) );
-  QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "B52" ) << 3 << QStringLiteral( "B52" ) << 80LL << 10.0 << 2 << 1 << 3 << QStringLiteral( "Point (-103 23)" ) ) );
+  QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "B52" ) << 3 << QStringLiteral( "B52" ) << 89LL << 10.0 << 2 << 1 << 3 << QStringLiteral( "Point (-103 23)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 90LL << 3.0 << 2 << 0 << 2 << QStringLiteral( "Point (-117 37)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 85LL << 3.0 << 1 << 1 << 2 << QStringLiteral( "Point (-117 37)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 95LL << 3.0 << 1 << 1 << 2 << QStringLiteral( "Point (-117 37)" ) ) );
-  QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 90LL << 3.0 << 1 << 0 << 1 << QStringLiteral( "Point (-117 37)" ) ) );
+  QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 91LL << 3.0 << 1 << 0 << 1 << QStringLiteral( "Point (-117 37)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 160LL << 4.0 << 2 << 0 << 2 << QStringLiteral( "Point (-117 37)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 180LL << 3.0 << 1 << 0 << 1 << QStringLiteral( "Point (-117 37)" ) ) );
   QVERIFY( res.contains( QgsAttributes() << QStringLiteral( "Jet" ) << 1 << QStringLiteral( "Jet" ) << 140LL << 10.0 << 1 << 1 << 2 << QStringLiteral( "Point (-117 37)" ) ) );
diff --git a/tests/src/core/testqgsvectordataprovider.cpp b/tests/src/core/testqgsvectordataprovider.cpp
index dfdf61ff6c2f..5536c45dfdb2 100644
--- a/tests/src/core/testqgsvectordataprovider.cpp
+++ b/tests/src/core/testqgsvectordataprovider.cpp
@@ -100,7 +100,7 @@ static void checkFid4( QgsFeature &f, bool hasGeometry, bool hasAttrs, int onlyO
   if ( hasAttrs )
   {
     QCOMPARE( attrs[0].toString(), ( onlyOneAttribute == -1 || onlyOneAttribute == 0 ) ? QString( "Jet" ) : QString() );
-    QCOMPARE( attrs[1].toInt(), ( onlyOneAttribute == -1 || onlyOneAttribute == 1 ) ? 90 : 0 );
+    QCOMPARE( attrs[1].toInt(), ( onlyOneAttribute == -1 || onlyOneAttribute == 1 ) ? 91 : 0 );
     QCOMPARE( attrs[2].toInt(), ( onlyOneAttribute == -1 || onlyOneAttribute == 2 ) ? 3 : 0 );
   }
   else
diff --git a/tests/src/gui/testqgsdualview.cpp b/tests/src/gui/testqgsdualview.cpp
index 66c83207a28c..93e7d721ddb7 100644
--- a/tests/src/gui/testqgsdualview.cpp
+++ b/tests/src/gui/testqgsdualview.cpp
@@ -227,10 +227,10 @@ void TestQgsDualView::testSort()
            <<  QStringLiteral( "0" )
            <<  QStringLiteral( "12" )
            <<  QStringLiteral( "34" )
-           <<  QStringLiteral( "80" )
            <<  QStringLiteral( "85" )
+           <<  QStringLiteral( "89" )
            <<  QStringLiteral( "90" )
-           <<  QStringLiteral( "90" )
+           <<  QStringLiteral( "91" )
            <<  QStringLiteral( "95" )
            <<  QStringLiteral( "100" )
            <<  QStringLiteral( "140" )
@@ -238,8 +238,7 @@ void TestQgsDualView::testSort()
            <<  QStringLiteral( "180" )
            <<  QStringLiteral( "240" )
            <<  QStringLiteral( "270" )
-           <<  QStringLiteral( "300" )
-           <<  QStringLiteral( "340" );
+           <<  QStringLiteral( "300" );
 
   mDualView->setSortExpression( QStringLiteral( "Heading" ) );
 
diff --git a/tests/testdata/control_images/composer_table/expected_composerattributetable_columnwidth/expected_composerattributetable_columnwidth.png b/tests/testdata/control_images/composer_table/expected_composerattributetable_columnwidth/expected_composerattributetable_columnwidth.png
index dd607b9d6b68..9d8fee801443 100644
Binary files a/tests/testdata/control_images/composer_table/expected_composerattributetable_columnwidth/expected_composerattributetable_columnwidth.png and b/tests/testdata/control_images/composer_table/expected_composerattributetable_columnwidth/expected_composerattributetable_columnwidth.png differ
diff --git a/tests/testdata/control_images/composer_table/expected_composerattributetable_conditionalstyles/expected_composerattributetable_conditionalstyles.png b/tests/testdata/control_images/composer_table/expected_composerattributetable_conditionalstyles/expected_composerattributetable_conditionalstyles.png
index c188fbda136c..8d4043a56ad3 100644
Binary files a/tests/testdata/control_images/composer_table/expected_composerattributetable_conditionalstyles/expected_composerattributetable_conditionalstyles.png and b/tests/testdata/control_images/composer_table/expected_composerattributetable_conditionalstyles/expected_composerattributetable_conditionalstyles.png differ
diff --git a/tests/testdata/control_images/composer_table/expected_composerattributetable_conditionalstyles_text/expected_composerattributetable_conditionalstyles_text.png b/tests/testdata/control_images/composer_table/expected_composerattributetable_conditionalstyles_text/expected_composerattributetable_conditionalstyles_text.png
index 75605f4bd967..5ea9d339094b 100644
Binary files a/tests/testdata/control_images/composer_table/expected_composerattributetable_conditionalstyles_text/expected_composerattributetable_conditionalstyles_text.png and b/tests/testdata/control_images/composer_table/expected_composerattributetable_conditionalstyles_text/expected_composerattributetable_conditionalstyles_text.png differ
diff --git a/tests/testdata/control_images/composer_table/expected_composerattributetable_render/expected_composerattributetable_render.png b/tests/testdata/control_images/composer_table/expected_composerattributetable_render/expected_composerattributetable_render.png
index fde11b8cc71a..94bce87cfeb6 100644
Binary files a/tests/testdata/control_images/composer_table/expected_composerattributetable_render/expected_composerattributetable_render.png and b/tests/testdata/control_images/composer_table/expected_composerattributetable_render/expected_composerattributetable_render.png differ
diff --git a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateAttributeTable_0/expected_importComposerTemplateAttributeTable_0.png b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateAttributeTable_0/expected_importComposerTemplateAttributeTable_0.png
index 534a972bc45a..61fba3790a53 100644
Binary files a/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateAttributeTable_0/expected_importComposerTemplateAttributeTable_0.png and b/tests/testdata/control_images/compositionconverter/expected_importComposerTemplateAttributeTable_0/expected_importComposerTemplateAttributeTable_0.png differ
diff --git a/tests/testdata/control_images/expected_single/default/expected_single.png b/tests/testdata/control_images/expected_single/default/expected_single.png
index 61da69cd2185..0499844fdfa4 100644
Binary files a/tests/testdata/control_images/expected_single/default/expected_single.png and b/tests/testdata/control_images/expected_single/default/expected_single.png differ
diff --git a/tests/testdata/control_images/symbol_simplemarker/expected_simplemarker_boundsrotationoffset/expected_simplemarker_boundsrotationoffset.png b/tests/testdata/control_images/symbol_simplemarker/expected_simplemarker_boundsrotationoffset/expected_simplemarker_boundsrotationoffset.png
index 1f1307e90cb9..b4359221ab7a 100644
Binary files a/tests/testdata/control_images/symbol_simplemarker/expected_simplemarker_boundsrotationoffset/expected_simplemarker_boundsrotationoffset.png and b/tests/testdata/control_images/symbol_simplemarker/expected_simplemarker_boundsrotationoffset/expected_simplemarker_boundsrotationoffset.png differ