diff --git a/kronolith/test/Kronolith/Autoload.php b/kronolith/test/Kronolith/Autoload.php
index e15b0a10ae7..9839755c264 100644
--- a/kronolith/test/Kronolith/Autoload.php
+++ b/kronolith/test/Kronolith/Autoload.php
@@ -22,9 +22,10 @@
 require_once __DIR__ . '/Integration/Kronolith/Sql/Base.php';
 
 /** Load stub definitions */
+require_once __DIR__ . '/Stub/CalendarManager.php';
 require_once __DIR__ . '/Stub/Driver.php';
+require_once __DIR__ . '/Stub/Objects.php';
 require_once __DIR__ . '/Stub/Registry.php';
 require_once __DIR__ . '/Stub/ShareFactory.php';
 require_once __DIR__ . '/Stub/Tagger.php';
 require_once __DIR__ . '/Stub/Types.php';
-require_once __DIR__ . '/Stub/CalendarManager.php';
diff --git a/kronolith/test/Kronolith/Stub/Objects.php b/kronolith/test/Kronolith/Stub/Objects.php
new file mode 100644
index 00000000000..2cf0802a8ef
--- /dev/null
+++ b/kronolith/test/Kronolith/Stub/Objects.php
@@ -0,0 +1,8 @@
+<?php
+
+class Content_Objects_Manager
+{
+  public function delete()
+  {
+  }
+}
\ No newline at end of file
diff --git a/kronolith/test/Kronolith/TestCase.php b/kronolith/test/Kronolith/TestCase.php
index 4fb7f8bd9bc..397f720847f 100644
--- a/kronolith/test/Kronolith/TestCase.php
+++ b/kronolith/test/Kronolith/TestCase.php
@@ -67,6 +67,7 @@ protected static function createBasicKronolithSetup(Horde_Test_Setup $setup)
                 'session' => 'Horde_Session',
             )
         );
+        $GLOBALS['injector']->setInstance('Content_Objects_Manager', new Content_Objects_Manager());
         $GLOBALS['injector']->setInstance('Content_Tagger', new Content_Tagger());
         $GLOBALS['injector']->setInstance('Content_Types_Manager', new Content_Types_Manager());
         $GLOBALS['conf']['prefs']['driver'] = 'Null';