diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
index 38e2b2d1e24..941e8bbb0bb 100644
--- a/src/core/qgspallabeling.cpp
+++ b/src/core/qgspallabeling.cpp
@@ -4052,7 +4052,7 @@ void QgsPalLabeling::drawLabeling( QgsRenderContext& context )
   double bbox[] = { extent.xMinimum(), extent.yMinimum(), extent.xMaximum(), extent.yMaximum() };
 
   std::list<LabelPosition*>* labels;
-  pal::Problem* problem;
+  pal::Problem *problem;
   try
   {
     problem = mPal->extractProblem( scale, bbox );
@@ -4066,7 +4066,10 @@ void QgsPalLabeling::drawLabeling( QgsRenderContext& context )
   }
 
   if ( context.renderingStopped() )
+  {
+    delete problem;
     return; // it has been cancelled
+  }
 
 #if 1 // XXX strk
   // features are pre-rotated but not scaled/translated,
diff --git a/tests/src/core/testqgscomposerdd.cpp b/tests/src/core/testqgscomposerdd.cpp
index 529f600ce1b..61bff6b5b93 100644
--- a/tests/src/core/testqgscomposerdd.cpp
+++ b/tests/src/core/testqgscomposerdd.cpp
@@ -39,6 +39,7 @@ class TestQgsComposerDD : public QObject
   public:
     TestQgsComposerDD()
         : mComposition( 0 )
+        , mMapSettings( 0 )
         , mVectorLayer( 0 )
         , mAtlasMap( 0 )
         , mAtlas( 0 )
diff --git a/tests/src/core/testqgscomposergroup.cpp b/tests/src/core/testqgscomposergroup.cpp
index c80f19fb5ef..c49b8a1648e 100644
--- a/tests/src/core/testqgscomposergroup.cpp
+++ b/tests/src/core/testqgscomposergroup.cpp
@@ -31,6 +31,7 @@ class TestQgsComposerGroup : public QObject
   public:
     TestQgsComposerGroup()
         : mComposition( 0 )
+        , mMapSettings( 0 )
         , mItem1( 0 )
         , mItem2( 0 )
         , mGroup( 0 )
diff --git a/tests/src/core/testqgscomposermap.cpp b/tests/src/core/testqgscomposermap.cpp
index 5a00a8174e9..20b9a93025a 100644
--- a/tests/src/core/testqgscomposermap.cpp
+++ b/tests/src/core/testqgscomposermap.cpp
@@ -34,6 +34,7 @@ class TestQgsComposerMap : public QObject
     TestQgsComposerMap()
         : mComposition( 0 )
         , mComposerMap( 0 )
+        , mMapSettings( 0 )
         , mRasterLayer( 0 )
     {}
 
diff --git a/tests/src/core/testqgscomposermapgrid.cpp b/tests/src/core/testqgscomposermapgrid.cpp
index 57ca8dbb927..c5d27bb7e0f 100644
--- a/tests/src/core/testqgscomposermapgrid.cpp
+++ b/tests/src/core/testqgscomposermapgrid.cpp
@@ -66,17 +66,18 @@ class TestQgsComposerMapGrid : public QObject
 };
 
 TestQgsComposerMapGrid::TestQgsComposerMapGrid()
-    : mComposition( NULL )
-    , mComposerMap( NULL )
+    : mComposition( 0 )
+    , mComposerMap( 0 )
+    , mMapSettings( 0 )
 {
-  QgsApplication::init();
-  QgsApplication::initQgis();
-
-  mMapSettings = new QgsMapSettings();
 }
 
 void TestQgsComposerMapGrid::initTestCase()
 {
+  QgsApplication::init();
+  QgsApplication::initQgis();
+  mMapSettings = new QgsMapSettings();
+
   mReport = "<h1>Composer Map Grid Tests</h1>\n";
 }
 
diff --git a/tests/src/core/testqgscomposermodel.cpp b/tests/src/core/testqgscomposermodel.cpp
index c9473bc9903..771b64e0f6b 100644
--- a/tests/src/core/testqgscomposermodel.cpp
+++ b/tests/src/core/testqgscomposermodel.cpp
@@ -31,6 +31,7 @@ class TestQgsComposerModel : public QObject
   public:
     TestQgsComposerModel()
         : mComposition( 0 )
+        , mMapSettings( 0 )
         , mItem1( 0 )
         , mItem2( 0 )
         , mItem3( 0 )
diff --git a/tests/src/core/testqgscomposerpaper.cpp b/tests/src/core/testqgscomposerpaper.cpp
index 191f14d1bcd..be45848c422 100644
--- a/tests/src/core/testqgscomposerpaper.cpp
+++ b/tests/src/core/testqgscomposerpaper.cpp
@@ -40,6 +40,7 @@ class TestQgsComposerPaper : public QObject
         , mMarkerLine( 0 )
         , mFillSymbol( 0 )
         , mMarkerLineSymbol( 0 )
+        , mMapSettings( 0 )
     {}
 
   private slots:
diff --git a/tests/src/core/testqgscomposershapes.cpp b/tests/src/core/testqgscomposershapes.cpp
index 7f6b7de5eb6..8545c0db425 100644
--- a/tests/src/core/testqgscomposershapes.cpp
+++ b/tests/src/core/testqgscomposershapes.cpp
@@ -36,6 +36,7 @@ class TestQgsComposerShapes : public QObject
     TestQgsComposerShapes()
         : mComposition( 0 )
         , mComposerShape( 0 )
+        , mMapSettings( 0 )
         , mSimpleFill( 0 )
         , mFillSymbol( 0 )
     {}