diff --git a/autotests/libs/collectioncreatetest.cpp b/autotests/libs/collectioncreatetest.cpp
--- a/autotests/libs/collectioncreatetest.cpp
+++ b/autotests/libs/collectioncreatetest.cpp
@@ -40,7 +40,7 @@
     void testCreateCollection()
     {
         auto monitor = getTestMonitor();
-        QSignalSpy spy(monitor, &Monitor::collectionAdded);
+        QSignalSpy spy(monitor.get(), &Monitor::collectionAdded);
 
         Collection col;
         col.setName(QLatin1String("test_collection"));
diff --git a/autotests/libs/itemdeletetest.cpp b/autotests/libs/itemdeletetest.cpp
--- a/autotests/libs/itemdeletetest.cpp
+++ b/autotests/libs/itemdeletetest.cpp
@@ -59,7 +59,7 @@
     void testDelete()
     {
         auto monitor = getTestMonitor();
-        QSignalSpy spy(monitor, &Monitor::itemsRemoved);
+        QSignalSpy spy(monitor.get(), &Monitor::itemsRemoved);
 
         ItemFetchJob *fjob = new ItemFetchJob(Item(1), this);
         AKVERIFYEXEC(fjob);
@@ -81,7 +81,7 @@
     void testDeleteFromUnselectedCollection()
     {
         auto monitor = getTestMonitor();
-        QSignalSpy spy(monitor, &Monitor::itemsRemoved);
+        QSignalSpy spy(monitor.get(), &Monitor::itemsRemoved);
 
         const QString path = QStringLiteral("res1") +
                              CollectionPathResolver::pathDelimiter() +
@@ -115,7 +115,7 @@
     void testRidDelete()
     {
         auto monitor = getTestMonitor();
-        QSignalSpy spy(monitor, &Monitor::itemsRemoved);
+        QSignalSpy spy(monitor.get(), &Monitor::itemsRemoved);
 
         {
             ResourceSelectJob *select = new ResourceSelectJob(QStringLiteral("akonadi_knut_resource_0"));
@@ -154,7 +154,7 @@
     void testTagDelete()
     {
         auto monitor = getTestMonitor();
-        QSignalSpy spy(monitor, &Monitor::itemsRemoved);
+        QSignalSpy spy(monitor.get(), &Monitor::itemsRemoved);
 
         // Create tag
         Tag tag;
@@ -198,7 +198,7 @@
     void testCollectionDelete()
     {
         auto monitor = getTestMonitor();
-        QSignalSpy spy(monitor, &Monitor::itemsRemoved);
+        QSignalSpy spy(monitor.get(), &Monitor::itemsRemoved);
 
         const Collection col(collectionIdFromPath(QStringLiteral("res1/foo")));
         ItemFetchJob *fjob = new ItemFetchJob(col, this);
diff --git a/autotests/libs/itemmovetest.cpp b/autotests/libs/itemmovetest.cpp
--- a/autotests/libs/itemmovetest.cpp
+++ b/autotests/libs/itemmovetest.cpp
@@ -144,17 +144,17 @@
         QEXPECT_FAIL("", "Check not yet implemented by the server.", Continue);
         QVERIFY(!store->exec());
 
-        Monitor *monitor = getTestMonitor();
-        QSignalSpy itemMovedSpy(monitor, &Monitor::itemsMoved);
+        auto monitor = getTestMonitor();
+        QSignalSpy itemMovedSpy(monitor.get(), &Monitor::itemsMoved);
         // Wait for the notifciation so that it does not disturb the next test
         QTRY_COMPARE(itemMovedSpy.count(), 1);
     }
 
     void testMoveNotifications()
     {
-        Monitor *monitor = getTestMonitor();
-        QSignalSpy itemMovedSpy(monitor, &Monitor::itemsMoved);
-        QSignalSpy itemAddedSpy(monitor, &Monitor::itemAdded);
+        auto monitor = getTestMonitor();
+        QSignalSpy itemMovedSpy(monitor.get(), &Monitor::itemsMoved);
+        QSignalSpy itemAddedSpy(monitor.get(), &Monitor::itemAdded);
 
         Collection col(collectionIdFromPath(QStringLiteral("res1/foo")));
         Item item(QStringLiteral("application/octet-stream"));
diff --git a/autotests/libs/test_utils.h b/autotests/libs/test_utils.h
--- a/autotests/libs/test_utils.h
+++ b/autotests/libs/test_utils.h
@@ -97,7 +97,7 @@
     }
 }
 
-Akonadi::Monitor *getTestMonitor()
+std::unique_ptr<Akonadi::Monitor> getTestMonitor()
 {
     auto m = new Akonadi::Monitor();
     m->fetchCollection(true);
@@ -111,7 +111,7 @@
     QSignalSpy readySpy(m, &Akonadi::Monitor::monitorReady);
     readySpy.wait();
 
-    return m;
+    return std::unique_ptr<Akonadi::Monitor>(m);
 }
 
 #endif