Index: tests/testlib/akonadistoragetestbase.cpp
===================================================================
--- tests/testlib/akonadistoragetestbase.cpp
+++ tests/testlib/akonadistoragetestbase.cpp
@@ -147,7 +147,9 @@
                                             "{1d33862f-f274-4c67-ab6c-362d56521ff5}",
                                             "{1d33862f-f274-4c67-ab6c-362d56521ff6}",
                                             "{7824df00-2fd6-47a4-8319-52659dc82005}",
-                                            "{7824df00-2fd6-47a4-8319-52659dc82006}" };
+                                            "{7824df00-2fd6-47a4-8319-52659dc82006}",
+                                            "{d0159c99-0d23-41fa-bb5f-tasktoremove}",
+                                          };
 
     // WHEN
     auto job = storage->fetchItems(calendar2());
@@ -395,8 +397,7 @@
     QSignalSpy spy(monitor.data(), &Akonadi::MonitorInterface::itemRemoved);
     MonitorSpy monitorSpy(monitor.data());
 
-    const Akonadi::Collection notesCol = fetchCollectionByRID(QStringLiteral("{f5e3f1be-b998-4c56-aa3d-e3a6e7e5493a}"));
-    Akonadi::Item item = fetchItemByRID(QStringLiteral("{d0159c99-0d23-41fa-bb5f-436570140f8b}"), notesCol);
+    Akonadi::Item item = fetchItemByRID(QStringLiteral("{d0159c99-0d23-41fa-bb5f-tasktoremove}"), calendar2());
     QVERIFY(item.isValid());
 
     // WHEN
Index: tests/units/akonadi/testenv/data/testdata.xml
===================================================================
--- tests/units/akonadi/testenv/data/testdata.xml
+++ tests/units/akonadi/testenv/data/testdata.xml
@@ -240,6 +240,26 @@
 PERCENT-COMPLETE:0
 END:VTODO
 
+END:VCALENDAR</payload>
+          <attribute type="ForTestingPurpose">bar</attribute>
+          <flag>\SEEN</flag>
+          <tag>change-me</tag>
+        </item>
+        <item mimetype="application/x-vnd.akonadi.calendar.todo" rid="{d0159c99-0d23-41fa-bb5f-tasktoremove}">
+          <payload>BEGIN:VCALENDAR
+PRODID:-//K Desktop Environment//NONSGML libkcal 4.3//EN
+VERSION:2.0
+X-KDE-ICAL-IMPLEMENTATION-VERSION:1.0
+BEGIN:VTODO&#xd;
+DTSTAMP:20140317T162551Z&#xd;
+CREATED:20140317T162551Z&#xd;
+UID:d0159c99-0d23-41fa-bb5f-436570140f8b&#xd;
+LAST-MODIFIED:20140317T162551Z&#xd;
+SUMMARY:delete-me&#xd;
+DUE;VALUE=DATE:20140324&#xd;
+PERCENT-COMPLETE:0&#xd;
+END:VTODO&#xd;
+
 END:VCALENDAR</payload>
           <attribute type="ForTestingPurpose">bar</attribute>
           <flag>\SEEN</flag>