diff --git a/tests/src/python/test_qgsatlascomposition.py b/tests/src/python/test_qgsatlascomposition.py
@@ -82,6 +82,7 @@ def testCase(self):
         self.mLabel1 = QgsComposerLabel( self.mComposition )
         self.mComposition.addComposerLabel( self.mLabel1 )
         self.mLabel1.setText( "[% \"NAME_1\" %] area" )
+        self.mLabel1.setFont( QgsFontUtils.getStandardTestFont() )
         self.mLabel1.adjustSizeToText()
         self.mLabel1.setSceneRect( QRectF( 150, 5, 60, 15 ) )
 
@@ -91,6 +92,7 @@ def testCase(self):
         self.mLabel2 = QgsComposerLabel( self.mComposition )
         self.mComposition.addComposerLabel( self.mLabel2 )
         self.mLabel2.setText( "# [%$feature || ' / ' || $numfeatures%]" )
+        self.mLabel2.setFont( QgsFontUtils.getStandardTestFont() )
         self.mLabel2.adjustSizeToText()
         self.mLabel2.setSceneRect( QRectF( 150, 200, 60, 15 ) )
 
@@ -124,7 +126,7 @@ def autoscale_render_test( self ):
             self.mLabel1.adjustSizeToText()
 
             checker = QgsCompositionChecker('atlas_autoscale%d' % (i + 1), self.mComposition)
-            myTestResult, myMessage = checker.testComposition(0, 10)
+            myTestResult, myMessage = checker.testComposition(0, 200)
 
             assert myTestResult == True
         self.mAtlas.endRender()
@@ -145,7 +147,7 @@ def autoscale_render_test_old_api( self ):
             self.mLabel1.adjustSizeToText()
 
             checker = QgsCompositionChecker('atlas_autoscale_old_api%d' % (i + 1), self.mComposition)
-            myTestResult, myMessage = checker.testComposition()
+            myTestResult, myMessage = checker.testComposition(0, 200)
 
             assert myTestResult == True
         self.mAtlas.endRender()
@@ -166,7 +168,7 @@ def fixedscale_render_test( self ):
             self.mLabel1.adjustSizeToText()
 
             checker = QgsCompositionChecker('atlas_fixedscale%d' % (i + 1), self.mComposition)
-            myTestResult, myMessage = checker.testComposition()
+            myTestResult, myMessage = checker.testComposition(0, 200)
 
             assert myTestResult == True
         self.mAtlas.endRender()
@@ -183,7 +185,7 @@ def hidden_render_test( self ):
             self.mLabel1.adjustSizeToText()
 
             checker = QgsCompositionChecker('atlas_hiding%d' % (i + 1), self.mComposition)
-            myTestResult, myMessage = checker.testComposition()
+            myTestResult, myMessage = checker.testComposition(0, 200)
 
             assert myTestResult == True
         self.mAtlas.endRender()
@@ -204,7 +206,7 @@ def sorting_render_test( self ):
             self.mLabel1.adjustSizeToText()
 
             checker = QgsCompositionChecker('atlas_sorting%d' % (i + 1), self.mComposition)
-            myTestResult, myMessage = checker.testComposition()
+            myTestResult, myMessage = checker.testComposition(0, 200)
 
             assert myTestResult == True
         self.mAtlas.endRender()
@@ -226,7 +228,7 @@ def filtering_render_test( self ):
             self.mLabel1.adjustSizeToText()
 
             checker = QgsCompositionChecker('atlas_filtering%d' % (i + 1), self.mComposition)
-            myTestResult, myMessage = checker.testComposition()
+            myTestResult, myMessage = checker.testComposition(0, 200)
 
             assert myTestResult == True
         self.mAtlas.endRender()

diff --git a/tests/src/python/test_qgscomposermap.py b/tests/src/python/test_qgscomposermap.py
@@ -25,7 +25,8 @@
                        QgsComposition,
                        QgsMapRenderer,
                        QgsMapLayerRegistry,
-                       QgsMultiBandColorRenderer
+                       QgsMultiBandColorRenderer,
+                       QgsFontUtils
                      )
 from utilities import (unitTestDataPath,
                        getQgisTestApp,
@@ -78,6 +79,7 @@ def testGrid(self):
         self.mComposerMap.setShowGridAnnotation(True)
         self.mComposerMap.setGridPenWidth(0.5)
         self.mComposerMap.setGridPenColor(QColor(0,255,0))
+        self.mComposerMap.setGridAnnotationFont( QgsFontUtils.getStandardTestFont() )
         self.mComposerMap.setGridAnnotationPrecision(0)
         self.mComposerMap.setGridAnnotationPosition(QgsComposerMap.Disabled,
                                                     QgsComposerMap.Left)
@@ -95,7 +97,6 @@ def testGrid(self):
                                                      QgsComposerMap.Bottom)
         self.mComposerMap.setAnnotationFontColor(QColor(255,0,0,150))
         self.mComposerMap.setGridBlendMode(QPainter.CompositionMode_Overlay)
-        self.mComposerMap.setShowGridAnnotation(False)
         checker = QgsCompositionChecker('composermap_grid', self.mComposition)
         myTestResult, myMessage = checker.testComposition()
         self.mComposerMap.setGridEnabled(False)

diff --git a/...testdata/control_images/expected_atlas_autoscale1/expected_atlas_autoscale1.png b/...testdata/control_images/expected_atlas_autoscale1/expected_atlas_autoscale1.png
diff --git a/...s/testdata/control_images/expected_atlas_autoscale1/osgeo4w_nightly.anomoly.png b/...s/testdata/control_images/expected_atlas_autoscale1/osgeo4w_nightly.anomoly.png
diff --git a/tests/testdata/control_images/expected_atlas_autoscale1/ubuntu_13.04.anomaly.png b/tests/testdata/control_images/expected_atlas_autoscale1/ubuntu_13.04.anomaly.png
diff --git a/...testdata/control_images/expected_atlas_autoscale2/expected_atlas_autoscale2.png b/...testdata/control_images/expected_atlas_autoscale2/expected_atlas_autoscale2.png
diff --git a/tests/testdata/control_images/expected_atlas_autoscale2/ubuntu_13.04.anomaly.png b/tests/testdata/control_images/expected_atlas_autoscale2/ubuntu_13.04.anomaly.png
diff --git a/..._images/expected_atlas_autoscale_old_api1/expected_atlas_autoscale_old_api1.png b/..._images/expected_atlas_autoscale_old_api1/expected_atlas_autoscale_old_api1.png
diff --git a/...ta/control_images/expected_atlas_autoscale_old_api1/osgeo4w_nightly.anomoly.png b/...ta/control_images/expected_atlas_autoscale_old_api1/osgeo4w_nightly.anomoly.png
diff --git a/...tdata/control_images/expected_atlas_autoscale_old_api1/ubuntu_13.04.anomaly.png b/...tdata/control_images/expected_atlas_autoscale_old_api1/ubuntu_13.04.anomaly.png
diff --git a/..._images/expected_atlas_autoscale_old_api2/expected_atlas_autoscale_old_api2.png b/..._images/expected_atlas_autoscale_old_api2/expected_atlas_autoscale_old_api2.png
diff --git a/...tdata/control_images/expected_atlas_autoscale_old_api2/ubuntu_13.04.anomaly.png b/...tdata/control_images/expected_atlas_autoscale_old_api2/ubuntu_13.04.anomaly.png
diff --git a/...testdata/control_images/expected_atlas_filtering1/expected_atlas_filtering1.png b/...testdata/control_images/expected_atlas_filtering1/expected_atlas_filtering1.png
diff --git a/tests/testdata/control_images/expected_atlas_filtering1/ubuntu_13.04.anomaly.png b/tests/testdata/control_images/expected_atlas_filtering1/ubuntu_13.04.anomaly.png
diff --git a/...stdata/control_images/expected_atlas_fixedscale1/expected_atlas_fixedscale1.png b/...stdata/control_images/expected_atlas_fixedscale1/expected_atlas_fixedscale1.png
diff --git a/.../testdata/control_images/expected_atlas_fixedscale1/osgeo4w_nightly.anomoly.png b/.../testdata/control_images/expected_atlas_fixedscale1/osgeo4w_nightly.anomoly.png
diff --git a/tests/testdata/control_images/expected_atlas_fixedscale1/ubuntu_12.04.anomaly.png b/tests/testdata/control_images/expected_atlas_fixedscale1/ubuntu_12.04.anomaly.png
diff --git a/tests/testdata/control_images/expected_atlas_fixedscale1/ubuntu_13.04.anomaly.png b/tests/testdata/control_images/expected_atlas_fixedscale1/ubuntu_13.04.anomaly.png
diff --git a/...stdata/control_images/expected_atlas_fixedscale2/expected_atlas_fixedscale2.png b/...stdata/control_images/expected_atlas_fixedscale2/expected_atlas_fixedscale2.png
diff --git a/tests/testdata/control_images/expected_atlas_fixedscale2/ubuntu_13.04.anomaly.png b/tests/testdata/control_images/expected_atlas_fixedscale2/ubuntu_13.04.anomaly.png
diff --git a/...mages/expected_atlas_fixedscale_old_api1/expected_atlas_fixedscale_old_api1.png b/...mages/expected_atlas_fixedscale_old_api1/expected_atlas_fixedscale_old_api1.png
diff --git a/...a/control_images/expected_atlas_fixedscale_old_api1/osgeo4w_nightly.anomoly.png b/...a/control_images/expected_atlas_fixedscale_old_api1/osgeo4w_nightly.anomoly.png
diff --git a/...data/control_images/expected_atlas_fixedscale_old_api1/ubuntu_12.04.anomaly.png b/...data/control_images/expected_atlas_fixedscale_old_api1/ubuntu_12.04.anomaly.png
diff --git a/...data/control_images/expected_atlas_fixedscale_old_api1/ubuntu_13.04.anomaly.png b/...data/control_images/expected_atlas_fixedscale_old_api1/ubuntu_13.04.anomaly.png
diff --git a/...mages/expected_atlas_fixedscale_old_api2/expected_atlas_fixedscale_old_api2.png b/...mages/expected_atlas_fixedscale_old_api2/expected_atlas_fixedscale_old_api2.png
diff --git a/...data/control_images/expected_atlas_fixedscale_old_api2/ubuntu_13.04.anomaly.png b/...data/control_images/expected_atlas_fixedscale_old_api2/ubuntu_13.04.anomaly.png
diff --git a/tests/testdata/control_images/expected_atlas_hiding1/expected_atlas_hiding1.png b/tests/testdata/control_images/expected_atlas_hiding1/expected_atlas_hiding1.png
diff --git a/tests/testdata/control_images/expected_atlas_hiding1/osgeo4w_nightly.anomoly.png b/tests/testdata/control_images/expected_atlas_hiding1/osgeo4w_nightly.anomoly.png
diff --git a/tests/testdata/control_images/expected_atlas_hiding1/ubuntu_12.04.anomaly.png b/tests/testdata/control_images/expected_atlas_hiding1/ubuntu_12.04.anomaly.png
diff --git a/tests/testdata/control_images/expected_atlas_hiding1/ubuntu_13.04.anomaly.png b/tests/testdata/control_images/expected_atlas_hiding1/ubuntu_13.04.anomaly.png
diff --git a/tests/testdata/control_images/expected_atlas_hiding2/expected_atlas_hiding2.png b/tests/testdata/control_images/expected_atlas_hiding2/expected_atlas_hiding2.png
diff --git a/tests/testdata/control_images/expected_atlas_hiding2/ubuntu_13.04.anomaly.png b/tests/testdata/control_images/expected_atlas_hiding2/ubuntu_13.04.anomaly.png
diff --git a/tests/testdata/control_images/expected_atlas_sorting1/expected_atlas_sorting1.png b/tests/testdata/control_images/expected_atlas_sorting1/expected_atlas_sorting1.png
diff --git a/tests/testdata/control_images/expected_atlas_sorting1/ubuntu_13.04.anomaly.png b/tests/testdata/control_images/expected_atlas_sorting1/ubuntu_13.04.anomaly.png
diff --git a/tests/testdata/control_images/expected_atlas_sorting2/expected_atlas_sorting2.png b/tests/testdata/control_images/expected_atlas_sorting2/expected_atlas_sorting2.png
diff --git a/tests/testdata/control_images/expected_atlas_sorting2/ubuntu_13.04.anomaly.png b/tests/testdata/control_images/expected_atlas_sorting2/ubuntu_13.04.anomaly.png
diff --git a/...s/testdata/control_images/expected_atlas_two_maps1/expected_atlas_two_maps1.png b/...s/testdata/control_images/expected_atlas_two_maps1/expected_atlas_two_maps1.png
diff --git a/...s/testdata/control_images/expected_atlas_two_maps2/expected_atlas_two_maps2.png b/...s/testdata/control_images/expected_atlas_two_maps2/expected_atlas_two_maps2.png
diff --git a/...testdata/control_images/expected_composermap_grid/expected_composermap_grid.png b/...testdata/control_images/expected_composermap_grid/expected_composermap_grid.png
diff --git a/.../control_images/expected_composermap_overview/expected_composermap_overview.png b/.../control_images/expected_composermap_overview/expected_composermap_overview.png
diff --git a/...stdata/control_images/expected_composermap_overview/osgeo4w_nightly.anomoly.png b/...stdata/control_images/expected_composermap_overview/osgeo4w_nightly.anomoly.png
diff --git a/.../testdata/control_images/expected_composermap_overview/ubuntu_12.04.anomaly.png b/.../testdata/control_images/expected_composermap_overview/ubuntu_12.04.anomaly.png
diff --git a/.../testdata/control_images/expected_composermap_overview/ubuntu_13.04.anomaly.png b/.../testdata/control_images/expected_composermap_overview/ubuntu_13.04.anomaly.png
diff --git a/...pected_composermap_overview_blending/expected_composermap_overview_blending.png b/...pected_composermap_overview_blending/expected_composermap_overview_blending.png
diff --git a/.../control_images/expected_composermap_overview_blending/ubuntu_12.04.anomaly.png b/.../control_images/expected_composermap_overview_blending/ubuntu_12.04.anomaly.png
diff --git a/.../control_images/expected_composermap_overview_blending/ubuntu_13.04.anomaly.png b/.../control_images/expected_composermap_overview_blending/ubuntu_13.04.anomaly.png
diff --git a/...s/expected_composermap_overview_center/expected_composermap_overview_center.png b/...s/expected_composermap_overview_center/expected_composermap_overview_center.png
diff --git a/...ta/control_images/expected_composermap_overview_center/ubuntu_12.04.anomaly.png b/...ta/control_images/expected_composermap_overview_center/ubuntu_12.04.anomaly.png
diff --git a/...ta/control_images/expected_composermap_overview_center/ubuntu_13.04.anomaly.png b/...ta/control_images/expected_composermap_overview_center/ubuntu_13.04.anomaly.png
diff --git a/...s/expected_composermap_overview_invert/expected_composermap_overview_invert.png b/...s/expected_composermap_overview_invert/expected_composermap_overview_invert.png
diff --git a/...ta/control_images/expected_composermap_overview_invert/ubuntu_12.04.anomaly.png b/...ta/control_images/expected_composermap_overview_invert/ubuntu_12.04.anomaly.png
diff --git a/...ta/control_images/expected_composermap_overview_invert/ubuntu_13.04.anomaly.png b/...ta/control_images/expected_composermap_overview_invert/ubuntu_13.04.anomaly.png
diff --git a/...data/control_images/expected_composermap_render/expected_composermap_render.png b/...data/control_images/expected_composermap_render/expected_composermap_render.png
diff --git a/...testdata/control_images/expected_composermap_render/osgeo4w_nightly.anomoly.png b/...testdata/control_images/expected_composermap_render/osgeo4w_nightly.anomoly.png
diff --git a/tests/testdata/control_images/expected_composermap_render/ubuntu_13.04.anomaly.png b/tests/testdata/control_images/expected_composermap_render/ubuntu_13.04.anomaly.png
diff --git a/...trol_images/expected_composermap_zebrastyle/expected_composermap_zebrastyle.png b/...trol_images/expected_composermap_zebrastyle/expected_composermap_zebrastyle.png
diff --git a/...estdata/control_images/expected_composermap_zebrastyle/ubuntu_12.04.anomaly.png b/...estdata/control_images/expected_composermap_zebrastyle/ubuntu_12.04.anomaly.png
diff --git a/...trol_images/expected_composerrotation_label/expected_composerrotation_label.png b/...trol_images/expected_composerrotation_label/expected_composerrotation_label.png
diff --git a/..._composerrotation_mapitemrotation/expected_composerrotation_mapitemrotation.png b/..._composerrotation_mapitemrotation/expected_composerrotation_mapitemrotation.png
diff --git a/...expected_composerrotation_maprotation/expected_composerrotation_maprotation.png b/...expected_composerrotation_maprotation/expected_composerrotation_maprotation.png
diff --git a/...serrotation_maprotation_oldapi/expected_composerrotation_maprotation_oldapi.png b/...serrotation_maprotation_oldapi/expected_composerrotation_maprotation_oldapi.png
diff --git a/...ges/expected_composerscalebar_doublebox/expected_composerscalebar_doublebox.png b/...ges/expected_composerscalebar_doublebox/expected_composerscalebar_doublebox.png
diff --git a/...ata/control_images/expected_composerscalebar_doublebox/ubuntu_12.04.anomaly.png b/...ata/control_images/expected_composerscalebar_doublebox/ubuntu_12.04.anomaly.png
diff --git a/...ata/control_images/expected_composerscalebar_doublebox/ubuntu_13.10.anomoly.png b/...ata/control_images/expected_composerscalebar_doublebox/ubuntu_13.10.anomoly.png
diff --git a/..._images/expected_composerscalebar_numeric/expected_composerscalebar_numeric.png b/..._images/expected_composerscalebar_numeric/expected_composerscalebar_numeric.png
diff --git a/...tdata/control_images/expected_composerscalebar_numeric/ubuntu_12.04.anomaly.png b/...tdata/control_images/expected_composerscalebar_numeric/ubuntu_12.04.anomaly.png
diff --git a/...tdata/control_images/expected_composerscalebar_numeric/ubuntu_13.04.anomaly.png b/...tdata/control_images/expected_composerscalebar_numeric/ubuntu_13.04.anomaly.png
diff --git a/...tdata/control_images/expected_composerscalebar_numeric/ubuntu_13.10.anomaly.png b/...tdata/control_images/expected_composerscalebar_numeric/ubuntu_13.10.anomaly.png
diff --git a/...ges/expected_composerscalebar_singlebox/expected_composerscalebar_singlebox.png b/...ges/expected_composerscalebar_singlebox/expected_composerscalebar_singlebox.png
diff --git a/...ata/control_images/expected_composerscalebar_singlebox/ubuntu_12.04.anomaly.png b/...ata/control_images/expected_composerscalebar_singlebox/ubuntu_12.04.anomaly.png
diff --git a/...ata/control_images/expected_composerscalebar_singlebox/ubuntu_13.10.anomaly.png b/...ata/control_images/expected_composerscalebar_singlebox/ubuntu_13.10.anomaly.png
diff --git a/...ontrol_images/expected_composerscalebar_tick/expected_composerscalebar_tick.png b/...ontrol_images/expected_composerscalebar_tick/expected_composerscalebar_tick.png
diff --git a/...testdata/control_images/expected_composerscalebar_tick/ubuntu_12.04.anomaly.png b/...testdata/control_images/expected_composerscalebar_tick/ubuntu_12.04.anomaly.png
diff --git a/...testdata/control_images/expected_composerscalebar_tick/ubuntu_13.04.anomaly.png b/...testdata/control_images/expected_composerscalebar_tick/ubuntu_13.04.anomaly.png
diff --git a/...testdata/control_images/expected_composerscalebar_tick/ubuntu_13.10.anomaly.png b/...testdata/control_images/expected_composerscalebar_tick/ubuntu_13.10.anomaly.png