diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d7edfefaba..e723c0bfbdf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ MESSAGE(STATUS "QGIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS_VERSIO
 #############################################################
 # CMake settings
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.6)
 
 SET(CMAKE_COLOR_MAKEFILE ON)
 
diff --git a/INSTALL b/INSTALL
index de6be4cded6..1594355db52 100644
--- a/INSTALL
+++ b/INSTALL
@@ -92,7 +92,7 @@ Following a summary of the required dependencies for building:
 
 Required build tools:
 
-- CMake >= 2.8.0
+- CMake >= 2.8.6
 - Flex
 - Bison >= 2.4
 
diff --git a/tests/src/analysis/CMakeLists.txt b/tests/src/analysis/CMakeLists.txt
index a08a3588daa..8000e31fcdd 100644
--- a/tests/src/analysis/CMakeLists.txt
+++ b/tests/src/analysis/CMakeLists.txt
@@ -55,10 +55,8 @@ ENDIF (APPLE)
 MACRO (ADD_QGIS_TEST testname testsrc)
   SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
   SET(qgis_${testname}_MOC_CPPS ${testsrc})
-  QT4_WRAP_CPP(qgis_${testname}_MOC_SRCS ${qgis_${testname}_MOC_CPPS})
-  ADD_CUSTOM_TARGET(qgis_${testname}moc ALL DEPENDS ${qgis_${testname}_MOC_SRCS})
   ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
-  ADD_DEPENDENCIES(qgis_${testname} qgis_${testname}moc)
+  SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES AUTOMOC TRUE)
   TARGET_LINK_LIBRARIES(qgis_${testname}
     ${QT_QTCORE_LIBRARY}
     ${QT_QTTEST_LIBRARY}
diff --git a/tests/src/analysis/testopenstreetmap.cpp b/tests/src/analysis/testopenstreetmap.cpp
index 83ae9dd08a6..c1afafd156a 100644
--- a/tests/src/analysis/testopenstreetmap.cpp
+++ b/tests/src/analysis/testopenstreetmap.cpp
@@ -190,4 +190,4 @@ void TestOpenStreetMap::importAndQueries()
 
 QTEST_MAIN( TestOpenStreetMap )
 
-#include "moc_testopenstreetmap.cxx"
+#include "testopenstreetmap.moc"
diff --git a/tests/src/analysis/testqgsvectoranalyzer.cpp b/tests/src/analysis/testqgsvectoranalyzer.cpp
index 9472e3a5235..b3bb9359994 100644
--- a/tests/src/analysis/testqgsvectoranalyzer.cpp
+++ b/tests/src/analysis/testqgsvectoranalyzer.cpp
@@ -130,4 +130,4 @@ void TestQgsVectorAnalyzer::layerExtent()
 }
 
 QTEST_MAIN( TestQgsVectorAnalyzer )
-#include "moc_testqgsvectoranalyzer.cxx"
+#include "testqgsvectoranalyzer.moc"
diff --git a/tests/src/analysis/testqgszonalstatistics.cpp b/tests/src/analysis/testqgszonalstatistics.cpp
index c15c37072e7..039ed606aa0 100644
--- a/tests/src/analysis/testqgszonalstatistics.cpp
+++ b/tests/src/analysis/testqgszonalstatistics.cpp
@@ -117,4 +117,4 @@ void TestQgsZonalStatistics::testStatistics()
 }
 
 QTEST_MAIN( TestQgsZonalStatistics )
-#include "moc_testqgszonalstatistics.cxx"
+#include "testqgszonalstatistics.moc"
diff --git a/tests/src/app/CMakeLists.txt b/tests/src/app/CMakeLists.txt
index 4d7836802ef..e98c13a9d75 100644
--- a/tests/src/app/CMakeLists.txt
+++ b/tests/src/app/CMakeLists.txt
@@ -54,11 +54,9 @@ ENDIF (APPLE)
 
 MACRO (ADD_QGIS_TEST testname testsrc)
   SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
-  SET(qgis_${testname}_MOC_CPPS ${testsrc})
-  QT4_WRAP_CPP(qgis_${testname}_MOC_SRCS ${qgis_${testname}_MOC_CPPS})
   ADD_CUSTOM_TARGET(qgis_${testname}moc ALL DEPENDS ${qgis_${testname}_MOC_SRCS})
   ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
-  ADD_DEPENDENCIES(qgis_${testname} qgis_${testname}moc)
+  SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES AUTOMOC TRUE)
   TARGET_LINK_LIBRARIES(qgis_${testname}
     ${QT_QTXML_LIBRARY}
     ${QT_QTCORE_LIBRARY}
diff --git a/tests/src/app/testqgisappclipboard.cpp b/tests/src/app/testqgisappclipboard.cpp
index 5f652c9567a..5ebd87dcc1c 100644
--- a/tests/src/app/testqgisappclipboard.cpp
+++ b/tests/src/app/testqgisappclipboard.cpp
@@ -100,4 +100,4 @@ void TestQgisAppClipboard::copyPaste()
 }
 
 QTEST_MAIN( TestQgisAppClipboard )
-#include "moc_testqgisappclipboard.cxx"
+#include "testqgisappclipboard.moc"
diff --git a/tests/src/core/CMakeLists.txt b/tests/src/core/CMakeLists.txt
index 1735d456534..e4857b63671 100644
--- a/tests/src/core/CMakeLists.txt
+++ b/tests/src/core/CMakeLists.txt
@@ -55,10 +55,8 @@ ENDIF (APPLE)
 MACRO (ADD_QGIS_TEST testname testsrc)
   SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
   SET(qgis_${testname}_MOC_CPPS ${testsrc})
-  QT4_WRAP_CPP(qgis_${testname}_MOC_SRCS ${qgis_${testname}_MOC_CPPS})
-  ADD_CUSTOM_TARGET(qgis_${testname}moc ALL DEPENDS ${qgis_${testname}_MOC_SRCS})
   ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
-  ADD_DEPENDENCIES(qgis_${testname} qgis_${testname}moc)
+  SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES AUTOMOC TRUE)
   TARGET_LINK_LIBRARIES(qgis_${testname}
     ${QT_QTXML_LIBRARY}
     ${QT_QTCORE_LIBRARY}
diff --git a/tests/src/core/regression1141.cpp b/tests/src/core/regression1141.cpp
index b8833979fe1..42cab0d5c5b 100644
--- a/tests/src/core/regression1141.cpp
+++ b/tests/src/core/regression1141.cpp
@@ -160,4 +160,4 @@ void Regression1141::diacriticalTest()
 
 
 QTEST_MAIN( Regression1141 )
-#include "moc_regression1141.cxx"
+#include "regression1141.moc"
diff --git a/tests/src/core/regression992.cpp b/tests/src/core/regression992.cpp
index a2f59e190b8..4f17156ce74 100644
--- a/tests/src/core/regression992.cpp
+++ b/tests/src/core/regression992.cpp
@@ -123,4 +123,4 @@ void Regression992::regression992()
 }
 
 QTEST_MAIN( Regression992 )
-#include "moc_regression992.cxx"
+#include "regression992.moc"
diff --git a/tests/src/core/test_template.cpp b/tests/src/core/test_template.cpp
index 114d65cbf64..9dfa280e37e 100644
--- a/tests/src/core/test_template.cpp
+++ b/tests/src/core/test_template.cpp
@@ -27,7 +27,7 @@ class Test[testClassCamelCaseName]: public QObject
 };
 
 QTEST_MAIN( Test[testClassCamelCaseName] )
-#include "test[testClassLowerCaseName].moc.cpp"
+#include "test[testClassLowerCaseName].moc"
 
 
 
diff --git a/tests/src/core/testcontrastenhancements.cpp b/tests/src/core/testcontrastenhancements.cpp
index 0595f7ad530..67fc1a5fd80 100644
--- a/tests/src/core/testcontrastenhancements.cpp
+++ b/tests/src/core/testcontrastenhancements.cpp
@@ -103,5 +103,5 @@ void TestContrastEnhancements::linearMinMaxEnhancementTest()
   QVERIFY( 255.0 == myEnhancement.enhance( 240.0 ) );
 }
 QTEST_MAIN( TestContrastEnhancements )
-#include "moc_testcontrastenhancements.cxx"
+#include "testcontrastenhancements.moc"
 
diff --git a/tests/src/core/testmaprendererjob.cpp b/tests/src/core/testmaprendererjob.cpp
index d9863ce9ff7..bafa69942e2 100644
--- a/tests/src/core/testmaprendererjob.cpp
+++ b/tests/src/core/testmaprendererjob.cpp
@@ -276,4 +276,4 @@ void TestQgsMapRendererJob::testCache()
 
 
 QTEST_MAIN( TestQgsMapRendererJob )
-#include "moc_testmaprendererjob.cxx"
+#include "testmaprendererjob.moc"
diff --git a/tests/src/core/testqgsapplication.cpp b/tests/src/core/testqgsapplication.cpp
index d356bf59716..1bebd380a5f 100644
--- a/tests/src/core/testqgsapplication.cpp
+++ b/tests/src/core/testqgsapplication.cpp
@@ -64,5 +64,5 @@ void TestQgsApplication::checkGdalSkip()
 }
 
 QTEST_MAIN( TestQgsApplication )
-#include "moc_testqgsapplication.cxx"
+#include "testqgsapplication.moc"
 
diff --git a/tests/src/core/testqgsatlascomposition.cpp b/tests/src/core/testqgsatlascomposition.cpp
index 33c9546f173..dab2e2b3399 100644
--- a/tests/src/core/testqgsatlascomposition.cpp
+++ b/tests/src/core/testqgsatlascomposition.cpp
@@ -471,4 +471,4 @@ void TestQgsAtlasComposition::test_remove_layer()
 }
 
 QTEST_MAIN( TestQgsAtlasComposition )
-#include "moc_testqgsatlascomposition.cxx"
+#include "testqgsatlascomposition.moc"
diff --git a/tests/src/core/testqgsblendmodes.cpp b/tests/src/core/testqgsblendmodes.cpp
index 35fd60510eb..f0b469f2e37 100644
--- a/tests/src/core/testqgsblendmodes.cpp
+++ b/tests/src/core/testqgsblendmodes.cpp
@@ -223,4 +223,4 @@ bool TestQgsBlendModes::imageCheck( QString theTestType )
 }
 
 QTEST_MAIN( TestQgsBlendModes )
-#include "moc_testqgsblendmodes.cxx"
+#include "testqgsblendmodes.moc"
diff --git a/tests/src/core/testqgsclipper.cpp b/tests/src/core/testqgsclipper.cpp
index e33c9eb88c8..13ba7f55267 100644
--- a/tests/src/core/testqgsclipper.cpp
+++ b/tests/src/core/testqgsclipper.cpp
@@ -86,4 +86,4 @@ bool TestQgsClipper::checkBoundingBox( QPolygonF polygon, QgsRectangle clipRect
 }
 
 QTEST_MAIN( TestQgsClipper )
-#include "moc_testqgsclipper.cxx"
+#include "testqgsclipper.moc"
diff --git a/tests/src/core/testqgscolorscheme.cpp b/tests/src/core/testqgscolorscheme.cpp
index b8d7fc243c9..dfdca67e26c 100644
--- a/tests/src/core/testqgscolorscheme.cpp
+++ b/tests/src/core/testqgscolorscheme.cpp
@@ -155,4 +155,4 @@ void TestQgsColorScheme::clone()
 }
 
 QTEST_MAIN( TestQgsColorScheme )
-#include "moc_testqgscolorscheme.cxx"
+#include "testqgscolorscheme.moc"
diff --git a/tests/src/core/testqgscolorschemeregistry.cpp b/tests/src/core/testqgscolorschemeregistry.cpp
index 1677fc653b4..408507f868d 100644
--- a/tests/src/core/testqgscolorschemeregistry.cpp
+++ b/tests/src/core/testqgscolorschemeregistry.cpp
@@ -195,4 +195,4 @@ void TestQgsColorSchemeRegistry::matchingSchemes()
 }
 
 QTEST_MAIN( TestQgsColorSchemeRegistry )
-#include "moc_testqgscolorschemeregistry.cxx"
+#include "testqgscolorschemeregistry.moc"
diff --git a/tests/src/core/testqgscomposerdd.cpp b/tests/src/core/testqgscomposerdd.cpp
index e97e23b7ae4..b0448f9ca99 100644
--- a/tests/src/core/testqgscomposerdd.cpp
+++ b/tests/src/core/testqgscomposerdd.cpp
@@ -136,5 +136,5 @@ void TestQgsComposerDD::ddEvaluate()
 }
 
 QTEST_MAIN( TestQgsComposerDD )
-#include "moc_testqgscomposerdd.cxx"
+#include "testqgscomposerdd.moc"
 
diff --git a/tests/src/core/testqgscomposereffects.cpp b/tests/src/core/testqgscomposereffects.cpp
index ec76c52c83a..371cf71f237 100644
--- a/tests/src/core/testqgscomposereffects.cpp
+++ b/tests/src/core/testqgscomposereffects.cpp
@@ -108,4 +108,4 @@ void TestQgsComposerEffects::transparency()
 }
 
 QTEST_MAIN( TestQgsComposerEffects )
-#include "moc_testqgscomposereffects.cxx"
+#include "testqgscomposereffects.moc"
diff --git a/tests/src/core/testqgscomposergroup.cpp b/tests/src/core/testqgscomposergroup.cpp
index 085d389afb8..dd414c2a2e7 100644
--- a/tests/src/core/testqgscomposergroup.cpp
+++ b/tests/src/core/testqgscomposergroup.cpp
@@ -176,4 +176,4 @@ void TestQgsComposerGroup::undoRedo()
 }
 
 QTEST_MAIN( TestQgsComposerGroup )
-#include "moc_testqgscomposergroup.cxx"
+#include "testqgscomposergroup.moc"
diff --git a/tests/src/core/testqgscomposerhtml.cpp b/tests/src/core/testqgscomposerhtml.cpp
index 0268d7b9e53..fe61046072d 100644
--- a/tests/src/core/testqgscomposerhtml.cpp
+++ b/tests/src/core/testqgscomposerhtml.cpp
@@ -222,4 +222,4 @@ void TestQgsComposerHtml::htmlMultiFrameSmartBreak()
 
 
 QTEST_MAIN( TestQgsComposerHtml )
-#include "moc_testqgscomposerhtml.cxx"
+#include "testqgscomposerhtml.moc"
diff --git a/tests/src/core/testqgscomposerlabel.cpp b/tests/src/core/testqgscomposerlabel.cpp
index 6923e08e1ae..c83dea39980 100644
--- a/tests/src/core/testqgscomposerlabel.cpp
+++ b/tests/src/core/testqgscomposerlabel.cpp
@@ -209,4 +209,4 @@ void TestQgsComposerLabel::marginMethods()
 }
 
 QTEST_MAIN( TestQgsComposerLabel )
-#include "moc_testqgscomposerlabel.cxx"
+#include "testqgscomposerlabel.moc"
diff --git a/tests/src/core/testqgscomposermap.cpp b/tests/src/core/testqgscomposermap.cpp
index 82d481d42ef..e747f1f9d06 100644
--- a/tests/src/core/testqgscomposermap.cpp
+++ b/tests/src/core/testqgscomposermap.cpp
@@ -195,4 +195,4 @@ void TestQgsComposerMap::mapPolygonVertices()
 }
 
 QTEST_MAIN( TestQgsComposerMap )
-#include "moc_testqgscomposermap.cxx"
+#include "testqgscomposermap.moc"
diff --git a/tests/src/core/testqgscomposermapgrid.cpp b/tests/src/core/testqgscomposermapgrid.cpp
index 2ce306935a6..27463b72dde 100644
--- a/tests/src/core/testqgscomposermapgrid.cpp
+++ b/tests/src/core/testqgscomposermapgrid.cpp
@@ -584,4 +584,4 @@ void TestQgsComposerMapGrid::annotationFormats()
 
 
 QTEST_MAIN( TestQgsComposerMapGrid )
-#include "moc_testqgscomposermapgrid.cxx"
+#include "testqgscomposermapgrid.moc"
diff --git a/tests/src/core/testqgscomposermapoverview.cpp b/tests/src/core/testqgscomposermapoverview.cpp
index 25a0b314d61..809888a1d0a 100644
--- a/tests/src/core/testqgscomposermapoverview.cpp
+++ b/tests/src/core/testqgscomposermapoverview.cpp
@@ -201,4 +201,4 @@ void TestQgsComposerMapOverview::overviewMapCenter()
 }
 
 QTEST_MAIN( TestQgsComposerMapOverview )
-#include "moc_testqgscomposermapoverview.cxx"
+#include "testqgscomposermapoverview.moc"
diff --git a/tests/src/core/testqgscomposermodel.cpp b/tests/src/core/testqgscomposermodel.cpp
index f114204e1d4..66702395f78 100644
--- a/tests/src/core/testqgscomposermodel.cpp
+++ b/tests/src/core/testqgscomposermodel.cpp
@@ -586,4 +586,4 @@ void TestQgsComposerModel::reorderToBottomWithRemoved()
 }
 
 QTEST_MAIN( TestQgsComposerModel )
-#include "moc_testqgscomposermodel.cxx"
+#include "testqgscomposermodel.moc"
diff --git a/tests/src/core/testqgscomposermultiframe.cpp b/tests/src/core/testqgscomposermultiframe.cpp
index 028b3bcd258..942f9fe2dac 100644
--- a/tests/src/core/testqgscomposermultiframe.cpp
+++ b/tests/src/core/testqgscomposermultiframe.cpp
@@ -349,4 +349,4 @@ void TestQgsComposerMultiFrame::undoRedoRemovedFrame()
 }
 
 QTEST_MAIN( TestQgsComposerMultiFrame )
-#include "moc_testqgscomposermultiframe.cxx"
+#include "testqgscomposermultiframe.moc"
diff --git a/tests/src/core/testqgscomposerobject.cpp b/tests/src/core/testqgscomposerobject.cpp
index b3ce693c1fb..9717b655729 100644
--- a/tests/src/core/testqgscomposerobject.cpp
+++ b/tests/src/core/testqgscomposerobject.cpp
@@ -231,4 +231,4 @@ bool TestQgsComposerObject::renderCheck( QString testName, QImage &image, int mi
 }
 
 QTEST_MAIN( TestQgsComposerObject )
-#include "moc_testqgscomposerobject.cxx"
+#include "testqgscomposerobject.moc"
diff --git a/tests/src/core/testqgscomposerpaper.cpp b/tests/src/core/testqgscomposerpaper.cpp
index 83224ebf4d6..01a0da678db 100644
--- a/tests/src/core/testqgscomposerpaper.cpp
+++ b/tests/src/core/testqgscomposerpaper.cpp
@@ -132,4 +132,4 @@ void TestQgsComposerPaper::markerLinePaper()
 }
 
 QTEST_MAIN( TestQgsComposerPaper )
-#include "moc_testqgscomposerpaper.cxx"
+#include "testqgscomposerpaper.moc"
diff --git a/tests/src/core/testqgscomposerpicture.cpp b/tests/src/core/testqgscomposerpicture.cpp
index e4d1e04bbf1..53331ec174d 100644
--- a/tests/src/core/testqgscomposerpicture.cpp
+++ b/tests/src/core/testqgscomposerpicture.cpp
@@ -382,4 +382,4 @@ void TestQgsComposerPicture::pictureRemoteUrl()
 }
 
 QTEST_MAIN( TestQgsComposerPicture )
-#include "moc_testqgscomposerpicture.cxx"
+#include "testqgscomposerpicture.moc"
diff --git a/tests/src/core/testqgscomposerrotation.cpp b/tests/src/core/testqgscomposerrotation.cpp
index dd68121b256..bd0660144c8 100644
--- a/tests/src/core/testqgscomposerrotation.cpp
+++ b/tests/src/core/testqgscomposerrotation.cpp
@@ -224,4 +224,4 @@ void TestQgsComposerRotation::oldMapRotationApi()
 #endif
 
 QTEST_MAIN( TestQgsComposerRotation )
-#include "moc_testqgscomposerrotation.cxx"
+#include "testqgscomposerrotation.moc"
diff --git a/tests/src/core/testqgscomposerscalebar.cpp b/tests/src/core/testqgscomposerscalebar.cpp
index 3ac01b9eea2..44bf3d15b4b 100644
--- a/tests/src/core/testqgscomposerscalebar.cpp
+++ b/tests/src/core/testqgscomposerscalebar.cpp
@@ -171,4 +171,4 @@ void TestQgsComposerScaleBar::tick()
 };
 
 QTEST_MAIN( TestQgsComposerScaleBar )
-#include "moc_testqgscomposerscalebar.cxx"
+#include "testqgscomposerscalebar.moc"
diff --git a/tests/src/core/testqgscomposershapes.cpp b/tests/src/core/testqgscomposershapes.cpp
index 960fadda064..02dd94b1dfa 100644
--- a/tests/src/core/testqgscomposershapes.cpp
+++ b/tests/src/core/testqgscomposershapes.cpp
@@ -145,4 +145,4 @@ void TestQgsComposerShapes::symbolV2()
 }
 
 QTEST_MAIN( TestQgsComposerShapes )
-#include "moc_testqgscomposershapes.cxx"
+#include "testqgscomposershapes.moc"
diff --git a/tests/src/core/testqgscomposertable.cpp b/tests/src/core/testqgscomposertable.cpp
index 1714b557be7..6d122ca6766 100644
--- a/tests/src/core/testqgscomposertable.cpp
+++ b/tests/src/core/testqgscomposertable.cpp
@@ -506,5 +506,5 @@ void TestQgsComposerTable::attributeTableVisibleOnly()
 }
 
 QTEST_MAIN( TestQgsComposerTable )
-#include "moc_testqgscomposertable.cxx"
+#include "testqgscomposertable.moc"
 
diff --git a/tests/src/core/testqgscomposertablev2.cpp b/tests/src/core/testqgscomposertablev2.cpp
index e203e342cb1..8bcd1326228 100644
--- a/tests/src/core/testqgscomposertablev2.cpp
+++ b/tests/src/core/testqgscomposertablev2.cpp
@@ -614,5 +614,5 @@ void TestQgsComposerTableV2::removeDuplicates()
 }
 
 QTEST_MAIN( TestQgsComposerTableV2 )
-#include "moc_testqgscomposertablev2.cxx"
+#include "testqgscomposertablev2.moc"
 
diff --git a/tests/src/core/testqgscomposerutils.cpp b/tests/src/core/testqgscomposerutils.cpp
index aa4b2700359..90646bd8a1b 100644
--- a/tests/src/core/testqgscomposerutils.cpp
+++ b/tests/src/core/testqgscomposerutils.cpp
@@ -682,4 +682,4 @@ bool TestQgsComposerUtils::renderCheck( QString testName, QImage &image, int mis
 }
 
 QTEST_MAIN( TestQgsComposerUtils )
-#include "moc_testqgscomposerutils.cxx"
+#include "testqgscomposerutils.moc"
diff --git a/tests/src/core/testqgscomposition.cpp b/tests/src/core/testqgscomposition.cpp
index 63f917d5a31..642e1a767b6 100644
--- a/tests/src/core/testqgscomposition.cpp
+++ b/tests/src/core/testqgscomposition.cpp
@@ -242,5 +242,5 @@ void TestQgsComposition::pageIsEmpty()
 }
 
 QTEST_MAIN( TestQgsComposition )
-#include "moc_testqgscomposition.cxx"
+#include "testqgscomposition.moc"
 
diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
index 25499113ec7..7901a51e90c 100644
--- a/tests/src/core/testqgscoordinatereferencesystem.cpp
+++ b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -461,4 +461,4 @@ void TestQgsCoordinateReferenceSystem::debugPrint(
 }
 
 QTEST_MAIN( TestQgsCoordinateReferenceSystem )
-#include "moc_testqgscoordinatereferencesystem.cxx"
+#include "testqgscoordinatereferencesystem.moc"
diff --git a/tests/src/core/testqgscoordinatetransform.cpp b/tests/src/core/testqgscoordinatetransform.cpp
index 3da3f666a67..61a80bb792c 100644
--- a/tests/src/core/testqgscoordinatetransform.cpp
+++ b/tests/src/core/testqgscoordinatetransform.cpp
@@ -62,4 +62,4 @@ void TestQgsCoordinateTransform::transformBoundingBox()
 }
 
 QTEST_MAIN( TestQgsCoordinateTransform )
-#include "moc_testqgscoordinatetransform.cxx"
+#include "testqgscoordinatetransform.moc"
diff --git a/tests/src/core/testqgsdataitem.cpp b/tests/src/core/testqgsdataitem.cpp
index 30d34a329bf..30717101498 100644
--- a/tests/src/core/testqgsdataitem.cpp
+++ b/tests/src/core/testqgsdataitem.cpp
@@ -167,4 +167,4 @@ void TestQgsDataItem::testDirItemChildren()
 }
 
 QTEST_MAIN( TestQgsDataItem )
-#include "moc_testqgsdataitem.cxx"
+#include "testqgsdataitem.moc"
diff --git a/tests/src/core/testqgsdiagram.cpp b/tests/src/core/testqgsdiagram.cpp
index c3058599a31..67b0f25c439 100644
--- a/tests/src/core/testqgsdiagram.cpp
+++ b/tests/src/core/testqgsdiagram.cpp
@@ -173,4 +173,4 @@ class TestQgsDiagram: public QObject
 };
 
 QTEST_MAIN( TestQgsDiagram )
-#include "moc_testqgsdiagram.cxx"
+#include "testqgsdiagram.moc"
diff --git a/tests/src/core/testqgsdiagramexpression.cpp b/tests/src/core/testqgsdiagramexpression.cpp
index 006a26ee06c..9fd5841b7b1 100644
--- a/tests/src/core/testqgsdiagramexpression.cpp
+++ b/tests/src/core/testqgsdiagramexpression.cpp
@@ -176,4 +176,4 @@ class TestQgsDiagramExpression: public QObject
 };
 
 QTEST_MAIN( TestQgsDiagramExpression )
-#include "moc_testqgsdiagramexpression.cxx"
+#include "testqgsdiagramexpression.moc"
diff --git a/tests/src/core/testqgsdistancearea.cpp b/tests/src/core/testqgsdistancearea.cpp
index 0f773c24f75..d2305b69ead 100644
--- a/tests/src/core/testqgsdistancearea.cpp
+++ b/tests/src/core/testqgsdistancearea.cpp
@@ -162,7 +162,7 @@ void TestQgsDistanceArea::unit_conversions()
 };
 
 QTEST_MAIN( TestQgsDistanceArea )
-#include "moc_testqgsdistancearea.cxx"
+#include "testqgsdistancearea.moc"
 
 
 
diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
index 492c67e43a1..c015a80e122 100644
--- a/tests/src/core/testqgsexpression.cpp
+++ b/tests/src/core/testqgsexpression.cpp
@@ -974,5 +974,5 @@ class TestQgsExpression: public QObject
 
 QTEST_MAIN( TestQgsExpression )
 
-#include "moc_testqgsexpression.cxx"
+#include "testqgsexpression.moc"
 
diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
index 86e07bad871..9a90f6543a4 100644
--- a/tests/src/core/testqgsgeometry.cpp
+++ b/tests/src/core/testqgsgeometry.cpp
@@ -371,5 +371,5 @@ void TestQgsGeometry::dumpPolyline( QgsPolyline &thePolyline )
 }
 
 QTEST_MAIN( TestQgsGeometry )
-#include "moc_testqgsgeometry.cxx"
+#include "testqgsgeometry.moc"
 
diff --git a/tests/src/core/testqgsgeometryimport.cpp b/tests/src/core/testqgsgeometryimport.cpp
index 0efee5ea328..64badf47f9a 100644
--- a/tests/src/core/testqgsgeometryimport.cpp
+++ b/tests/src/core/testqgsgeometryimport.cpp
@@ -239,5 +239,5 @@ bool TestQgsGeometryImport::compareLineStrings( const QgsPolyline& polyline, QVa
 }
 
 QTEST_MAIN( TestQgsGeometryImport )
-#include "moc_testqgsgeometryimport.cxx"
+#include "testqgsgeometryimport.moc"
 
diff --git a/tests/src/core/testqgsgradients.cpp b/tests/src/core/testqgsgradients.cpp
index 967d2cd52e5..9625f9fc49d 100644
--- a/tests/src/core/testqgsgradients.cpp
+++ b/tests/src/core/testqgsgradients.cpp
@@ -287,4 +287,4 @@ bool TestQgsGradients::imageCheck( QString theTestType )
 }
 
 QTEST_MAIN( TestQgsGradients )
-#include "moc_testqgsgradients.cxx"
+#include "testqgsgradients.moc"
diff --git a/tests/src/core/testqgsinvertedpolygonrenderer.cpp b/tests/src/core/testqgsinvertedpolygonrenderer.cpp
index b5fe6bd955d..36799a64af7 100644
--- a/tests/src/core/testqgsinvertedpolygonrenderer.cpp
+++ b/tests/src/core/testqgsinvertedpolygonrenderer.cpp
@@ -179,4 +179,4 @@ bool TestQgsInvertedPolygon::imageCheck( QString theTestType, const QgsRectangle
 }
 
 QTEST_MAIN( TestQgsInvertedPolygon )
-#include "moc_testqgsinvertedpolygonrenderer.cxx"
+#include "testqgsinvertedpolygonrenderer.moc"
diff --git a/tests/src/core/testqgslegendrenderer.cpp b/tests/src/core/testqgslegendrenderer.cpp
index 2afad7e1d65..e74b00c5cbc 100644
--- a/tests/src/core/testqgslegendrenderer.cpp
+++ b/tests/src/core/testqgslegendrenderer.cpp
@@ -251,4 +251,4 @@ void TestQgsLegendRenderer::testThreeColumns()
 
 
 QTEST_MAIN( TestQgsLegendRenderer )
-#include "moc_testqgslegendrenderer.cxx"
+#include "testqgslegendrenderer.moc"
diff --git a/tests/src/core/testqgsmaplayer.cpp b/tests/src/core/testqgsmaplayer.cpp
index 48d67574867..894ca15b893 100644
--- a/tests/src/core/testqgsmaplayer.cpp
+++ b/tests/src/core/testqgsmaplayer.cpp
@@ -99,4 +99,4 @@ void TestQgsMapLayer::setBlendMode()
 }
 
 QTEST_MAIN( TestQgsMapLayer )
-#include "moc_testqgsmaplayer.cxx"
+#include "testqgsmaplayer.moc"
diff --git a/tests/src/core/testqgsmaprenderer.cpp b/tests/src/core/testqgsmaprenderer.cpp
index c15348e444d..64a4f7496f3 100644
--- a/tests/src/core/testqgsmaprenderer.cpp
+++ b/tests/src/core/testqgsmaprenderer.cpp
@@ -195,6 +195,6 @@ void TestQgsMapRenderer::performanceTest()
 }
 
 QTEST_MAIN( TestQgsMapRenderer )
-#include "moc_testqgsmaprenderer.cxx"
+#include "testqgsmaprenderer.moc"
 
 
diff --git a/tests/src/core/testqgsnetworkcontentfetcher.cpp b/tests/src/core/testqgsnetworkcontentfetcher.cpp
index 9e803780c5e..d6452b34225 100644
--- a/tests/src/core/testqgsnetworkcontentfetcher.cpp
+++ b/tests/src/core/testqgsnetworkcontentfetcher.cpp
@@ -157,4 +157,4 @@ void TestQgsNetworkContentFetcher::contentLoaded()
 }
 
 QTEST_MAIN( TestQgsNetworkContentFetcher )
-#include "moc_testqgsnetworkcontentfetcher.cxx"
+#include "testqgsnetworkcontentfetcher.moc"
diff --git a/tests/src/core/testqgsogcutils.cpp b/tests/src/core/testqgsogcutils.cpp
index c7de664083f..133a010b450 100644
--- a/tests/src/core/testqgsogcutils.cpp
+++ b/tests/src/core/testqgsogcutils.cpp
@@ -347,4 +347,4 @@ void TestQgsOgcUtils::testExpressionToOgcFilter_data()
 
 
 QTEST_MAIN( TestQgsOgcUtils )
-#include "moc_testqgsogcutils.cxx"
+#include "testqgsogcutils.moc"
diff --git a/tests/src/core/testqgspoint.cpp b/tests/src/core/testqgspoint.cpp
index 7bd80c6f4df..40078d35f52 100644
--- a/tests/src/core/testqgspoint.cpp
+++ b/tests/src/core/testqgspoint.cpp
@@ -534,4 +534,4 @@ void TestQgsPoint::onSegment()
 }
 
 QTEST_MAIN( TestQgsPoint )
-#include "moc_testqgspoint.cxx"
+#include "testqgspoint.moc"
diff --git a/tests/src/core/testqgsproject.cpp b/tests/src/core/testqgsproject.cpp
index c4caeeb7e68..a04c4ca8d56 100644
--- a/tests/src/core/testqgsproject.cpp
+++ b/tests/src/core/testqgsproject.cpp
@@ -74,4 +74,4 @@ void TestQgsProject::testReadPath()
 
 
 QTEST_MAIN( TestQgsProject )
-#include "moc_testqgsproject.cxx"
+#include "testqgsproject.moc"
diff --git a/tests/src/core/testqgsrasterfilewriter.cpp b/tests/src/core/testqgsrasterfilewriter.cpp
index 8296a153b51..b4317a77597 100644
--- a/tests/src/core/testqgsrasterfilewriter.cpp
+++ b/tests/src/core/testqgsrasterfilewriter.cpp
@@ -186,4 +186,4 @@ void TestQgsRasterFileWriter::logError( QString msg )
 }
 
 QTEST_MAIN( TestQgsRasterFileWriter )
-#include "moc_testqgsrasterfilewriter.cxx"
+#include "testqgsrasterfilewriter.moc"
diff --git a/tests/src/core/testqgsrasterlayer.cpp b/tests/src/core/testqgsrasterlayer.cpp
index 240580af26d..e29bcc0dfb2 100644
--- a/tests/src/core/testqgsrasterlayer.cpp
+++ b/tests/src/core/testqgsrasterlayer.cpp
@@ -584,4 +584,4 @@ void TestQgsRasterLayer::setRenderer()
 }
 
 QTEST_MAIN( TestQgsRasterLayer )
-#include "moc_testqgsrasterlayer.cxx"
+#include "testqgsrasterlayer.moc"
diff --git a/tests/src/core/testqgsrastersublayer.cpp b/tests/src/core/testqgsrastersublayer.cpp
index 65c7813f89b..c1a90c52a27 100644
--- a/tests/src/core/testqgsrastersublayer.cpp
+++ b/tests/src/core/testqgsrastersublayer.cpp
@@ -178,4 +178,4 @@ void TestQgsRasterSubLayer::checkStats()
 
 
 QTEST_MAIN( TestQgsRasterSubLayer )
-#include "moc_testqgsrastersublayer.cxx"
+#include "testqgsrastersublayer.moc"
diff --git a/tests/src/core/testqgsrectangle.cpp b/tests/src/core/testqgsrectangle.cpp
index b7d8a0f828c..ef4275822d8 100644
--- a/tests/src/core/testqgsrectangle.cpp
+++ b/tests/src/core/testqgsrectangle.cpp
@@ -87,7 +87,7 @@ void TestQgsRectangle::regression6194()
 };
 
 QTEST_MAIN( TestQgsRectangle )
-#include "moc_testqgsrectangle.cxx"
+#include "testqgsrectangle.moc"
 
 
 
diff --git a/tests/src/core/testqgsrenderers.cpp b/tests/src/core/testqgsrenderers.cpp
index d094e91d24d..867ffe2b86b 100644
--- a/tests/src/core/testqgsrenderers.cpp
+++ b/tests/src/core/testqgsrenderers.cpp
@@ -222,4 +222,4 @@ bool TestQgsRenderers::imageCheck( QString theTestType )
 }
 
 QTEST_MAIN( TestQgsRenderers )
-#include "moc_testqgsrenderers.cxx"
+#include "testqgsrenderers.moc"
diff --git a/tests/src/core/testqgsrulebasedrenderer.cpp b/tests/src/core/testqgsrulebasedrenderer.cpp
index 3a7813309de..efbe096d422 100644
--- a/tests/src/core/testqgsrulebasedrenderer.cpp
+++ b/tests/src/core/testqgsrulebasedrenderer.cpp
@@ -145,5 +145,5 @@ class TestQgsRuleBasedRenderer: public QObject
 
 QTEST_MAIN( TestQgsRuleBasedRenderer )
 
-#include "moc_testqgsrulebasedrenderer.cxx"
+#include "testqgsrulebasedrenderer.moc"
 
diff --git a/tests/src/core/testqgsshapeburst.cpp b/tests/src/core/testqgsshapeburst.cpp
index 66c8779f06f..391536815cf 100644
--- a/tests/src/core/testqgsshapeburst.cpp
+++ b/tests/src/core/testqgsshapeburst.cpp
@@ -242,4 +242,4 @@ bool TestQgsShapeburst::imageCheck( QString theTestType )
 }
 
 QTEST_MAIN( TestQgsShapeburst )
-#include "moc_testqgsshapeburst.cxx"
+#include "testqgsshapeburst.moc"
diff --git a/tests/src/core/testqgsspatialindex.cpp b/tests/src/core/testqgsspatialindex.cpp
index 29227ed07f7..a9e8ab2f39b 100644
--- a/tests/src/core/testqgsspatialindex.cpp
+++ b/tests/src/core/testqgsspatialindex.cpp
@@ -136,6 +136,6 @@ class TestQgsSpatialIndex : public QObject
 
 QTEST_MAIN( TestQgsSpatialIndex )
 
-#include "moc_testqgsspatialindex.cxx"
+#include "testqgsspatialindex.moc"
 
 
diff --git a/tests/src/core/testqgsstylev2.cpp b/tests/src/core/testqgsstylev2.cpp
index edb44a7bfb4..84893ecc27c 100644
--- a/tests/src/core/testqgsstylev2.cpp
+++ b/tests/src/core/testqgsstylev2.cpp
@@ -428,4 +428,4 @@ void TestStyleV2::testParseColorList()
 
 
 QTEST_MAIN( TestStyleV2 )
-#include "moc_testqgsstylev2.cxx"
+#include "testqgsstylev2.moc"
diff --git a/tests/src/core/testqgsvectordataprovider.cpp b/tests/src/core/testqgsvectordataprovider.cpp
index 48b860e20d3..4720b7977f6 100644
--- a/tests/src/core/testqgsvectordataprovider.cpp
+++ b/tests/src/core/testqgsvectordataprovider.cpp
@@ -229,4 +229,4 @@ void TestQgsVectorDataProvider::featureAtId()
 
 QTEST_MAIN( TestQgsVectorDataProvider )
 
-#include "moc_testqgsvectordataprovider.cxx"
+#include "testqgsvectordataprovider.moc"
diff --git a/tests/src/core/testqgsvectorfilewriter.cpp b/tests/src/core/testqgsvectorfilewriter.cpp
index 0df630c5f55..a58edbf0c77 100644
--- a/tests/src/core/testqgsvectorfilewriter.cpp
+++ b/tests/src/core/testqgsvectorfilewriter.cpp
@@ -390,5 +390,5 @@ void TestQgsVectorFileWriter::projectedPlygonGridTest()
 }
 
 QTEST_MAIN( TestQgsVectorFileWriter )
-#include "moc_testqgsvectorfilewriter.cxx"
+#include "testqgsvectorfilewriter.moc"
 
diff --git a/tests/src/core/testqgsvectorlayer.cpp b/tests/src/core/testqgsvectorlayer.cpp
index c3561a48db5..d76f93d65c8 100644
--- a/tests/src/core/testqgsvectorlayer.cpp
+++ b/tests/src/core/testqgsvectorlayer.cpp
@@ -704,4 +704,4 @@ class TestQgsVectorLayer: public QObject
 };
 
 QTEST_MAIN( TestQgsVectorLayer )
-#include "moc_testqgsvectorlayer.cxx"
+#include "testqgsvectorlayer.moc"
diff --git a/tests/src/core/testqgsvectorlayercache.cpp b/tests/src/core/testqgsvectorlayercache.cpp
index f3acdedb8f7..ab8e388cece 100644
--- a/tests/src/core/testqgsvectorlayercache.cpp
+++ b/tests/src/core/testqgsvectorlayercache.cpp
@@ -233,5 +233,5 @@ void TestVectorLayerCache::onCommittedFeaturesAdded( QString layerId, QgsFeature
 }
 
 QTEST_MAIN( TestVectorLayerCache )
-#include "moc_testqgsvectorlayercache.cxx"
+#include "testqgsvectorlayercache.moc"
 
diff --git a/tests/src/core/testqgsvectorlayerjoinbuffer.cpp b/tests/src/core/testqgsvectorlayerjoinbuffer.cpp
index 4129093916f..9a9e53091da 100644
--- a/tests/src/core/testqgsvectorlayerjoinbuffer.cpp
+++ b/tests/src/core/testqgsvectorlayerjoinbuffer.cpp
@@ -295,6 +295,6 @@ void TestVectorLayerJoinBuffer::testJoinSubset()
 
 
 QTEST_MAIN( TestVectorLayerJoinBuffer )
-#include "moc_testqgsvectorlayerjoinbuffer.cxx"
+#include "testqgsvectorlayerjoinbuffer.moc"
 
 
diff --git a/tests/src/core/testziplayer.cpp b/tests/src/core/testziplayer.cpp
index e64cff95e70..b3322fcbd72 100644
--- a/tests/src/core/testziplayer.cpp
+++ b/tests/src/core/testziplayer.cpp
@@ -538,4 +538,4 @@ void TestZipLayer::testZipItemVRT()
 }
 
 QTEST_MAIN( TestZipLayer )
-#include "moc_testziplayer.cxx"
+#include "testziplayer.moc"
diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt
index 2d8a1dbf581..82660abc1ec 100644
--- a/tests/src/gui/CMakeLists.txt
+++ b/tests/src/gui/CMakeLists.txt
@@ -84,10 +84,8 @@ ENDIF (APPLE)
 MACRO (ADD_QGIS_TEST testname testsrc)
   SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
   SET(qgis_${testname}_MOC_CPPS ${testsrc})
-  QT4_WRAP_CPP(qgis_${testname}_MOC_SRCS ${qgis_${testname}_MOC_CPPS})
-  ADD_CUSTOM_TARGET(qgis_${testname}moc ALL DEPENDS ${qgis_${testname}_MOC_SRCS})
   ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
-  ADD_DEPENDENCIES(qgis_${testname} qgis_${testname}moc)
+  SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES AUTOMOC TRUE)
   TARGET_LINK_LIBRARIES(qgis_${testname}
     ${QT_QTXML_LIBRARY}
     ${QT_QTCORE_LIBRARY}
diff --git a/tests/src/gui/testprojectionissues.cpp b/tests/src/gui/testprojectionissues.cpp
index c46189789d0..3c21232b13d 100644
--- a/tests/src/gui/testprojectionissues.cpp
+++ b/tests/src/gui/testprojectionissues.cpp
@@ -102,4 +102,4 @@ void TestProjectionIssues::issue5895()
 };
 
 QTEST_MAIN( TestProjectionIssues )
-#include "moc_testprojectionissues.cxx"
+#include "testprojectionissues.moc"
diff --git a/tests/src/gui/testqgsdualview.cpp b/tests/src/gui/testqgsdualview.cpp
index 1e602d0a0e3..ecc2a49b554 100644
--- a/tests/src/gui/testqgsdualview.cpp
+++ b/tests/src/gui/testqgsdualview.cpp
@@ -94,7 +94,7 @@ void TestQgsDualView::testSelectAll()
 }
 
 QTEST_MAIN( TestQgsDualView )
-#include "moc_testqgsdualview.cxx"
+#include "testqgsdualview.moc"
 
 
 
diff --git a/tests/src/gui/testqgsmapcanvas.cpp b/tests/src/gui/testqgsmapcanvas.cpp
index 2952f343792..6f05fb67557 100644
--- a/tests/src/gui/testqgsmapcanvas.cpp
+++ b/tests/src/gui/testqgsmapcanvas.cpp
@@ -91,4 +91,4 @@ void TestQgsMapCanvas::testMapRendererInteraction()
 
 
 QTEST_MAIN( TestQgsMapCanvas )
-#include "moc_testqgsmapcanvas.cxx"
+#include "testqgsmapcanvas.moc"
diff --git a/tests/src/gui/testqgsmaptoolzoom.cpp b/tests/src/gui/testqgsmaptoolzoom.cpp
index d121ba742e5..4712df0b227 100644
--- a/tests/src/gui/testqgsmaptoolzoom.cpp
+++ b/tests/src/gui/testqgsmaptoolzoom.cpp
@@ -86,7 +86,7 @@ void TestQgsMapToolZoom::zeroDragArea()
 }
 
 QTEST_MAIN( TestQgsMapToolZoom )
-#include "moc_testqgsmaptoolzoom.cxx"
+#include "testqgsmaptoolzoom.moc"
 
 
 
diff --git a/tests/src/gui/testqgsquickprint.cpp b/tests/src/gui/testqgsquickprint.cpp
index 6e688df548a..84b3ebd63ef 100644
--- a/tests/src/gui/testqgsquickprint.cpp
+++ b/tests/src/gui/testqgsquickprint.cpp
@@ -169,5 +169,5 @@ bool TestQgsQuickPrint::imageCheck( QString theTestType )
 }
 
 QTEST_MAIN( TestQgsQuickPrint )
-#include "moc_testqgsquickprint.cxx"
+#include "testqgsquickprint.moc"
 
diff --git a/tests/src/gui/testqgsrasterhistogram.cpp b/tests/src/gui/testqgsrasterhistogram.cpp
index 737884a53f4..e4caf331aa1 100644
--- a/tests/src/gui/testqgsrasterhistogram.cpp
+++ b/tests/src/gui/testqgsrasterhistogram.cpp
@@ -293,4 +293,4 @@ int TestRasterHistogram::testFile( QString theTestType,
 
 
 QTEST_MAIN( TestRasterHistogram )
-#include "moc_testqgsrasterhistogram.cxx"
+#include "testqgsrasterhistogram.moc"
diff --git a/tests/src/gui/testqgsrubberband.cpp b/tests/src/gui/testqgsrubberband.cpp
index 269833fdde0..cb2f7d484cc 100644
--- a/tests/src/gui/testqgsrubberband.cpp
+++ b/tests/src/gui/testqgsrubberband.cpp
@@ -98,7 +98,7 @@ void TestQgsRubberband::testAddSingleMultiGeometries()
 }
 
 QTEST_MAIN( TestQgsRubberband )
-#include "moc_testqgsrubberband.cxx"
+#include "testqgsrubberband.moc"
 
 
 
diff --git a/tests/src/gui/testqgsscalecombobox.cpp b/tests/src/gui/testqgsscalecombobox.cpp
index b1027f18d8e..5b75e5805d1 100644
--- a/tests/src/gui/testqgsscalecombobox.cpp
+++ b/tests/src/gui/testqgsscalecombobox.cpp
@@ -130,4 +130,4 @@ void TestQgsScaleComboBox::cleanup()
 };
 
 QTEST_MAIN( TestQgsScaleComboBox )
-#include "moc_testqgsscalecombobox.cxx"
+#include "testqgsscalecombobox.moc"
diff --git a/tests/src/providers/CMakeLists.txt b/tests/src/providers/CMakeLists.txt
index d67a23c2b64..9cd7e5c5168 100644
--- a/tests/src/providers/CMakeLists.txt
+++ b/tests/src/providers/CMakeLists.txt
@@ -55,11 +55,9 @@ ENDIF (APPLE)
 
 MACRO (ADD_QGIS_TEST testname testsrc)
   SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
-  SET(qgis_${testname}_MOC_CPPS ${testsrc})
-  QT4_WRAP_CPP(qgis_${testname}_MOC_SRCS ${qgis_${testname}_MOC_CPPS})
   ADD_CUSTOM_TARGET(qgis_${testname}moc ALL DEPENDS ${qgis_${testname}_MOC_SRCS})
   ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
-  ADD_DEPENDENCIES(qgis_${testname} qgis_${testname}moc)
+  SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES AUTOMOC TRUE)
   TARGET_LINK_LIBRARIES(qgis_${testname}
     ${QT_QTXML_LIBRARY}
     ${QT_QTCORE_LIBRARY}
diff --git a/tests/src/providers/testqgswcsprovider.cpp b/tests/src/providers/testqgswcsprovider.cpp
index d180a33b4b2..8b224b5cab1 100644
--- a/tests/src/providers/testqgswcsprovider.cpp
+++ b/tests/src/providers/testqgswcsprovider.cpp
@@ -160,4 +160,4 @@ bool TestQgsWcsProvider::read( QString theIdentifier, QString theWcsUri, QString
 }
 
 QTEST_MAIN( TestQgsWcsProvider )
-#include "moc_testqgswcsprovider.cxx"
+#include "testqgswcsprovider.moc"