diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Query/History/Base.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Query/History/Base.php
index 17b161ccf79..ac0fba7cec4 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Query/History/Base.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Query/History/Base.php
@@ -51,7 +51,7 @@ class Horde_Kolab_Storage_Data_Query_History_Base
      *
      * @var string Cached history prefix string
      */
-    private $_prefix;
+    protected $_prefix;
 
     /**
      * Constructor.
diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Query/Preferences/Base.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Query/Preferences/Base.php
index d27f4559cee..a1e9d962747 100644
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Query/Preferences/Base.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Query/Preferences/Base.php
@@ -33,14 +33,14 @@ class Horde_Kolab_Storage_Data_Query_Preferences_Base
      *
      * @var Horde_Kolab_Storage_Data
      */
-    private $_data;
+    protected $_data;
 
     /**
      * The cached preference mapping.
      *
      * @var array
      */
-    private $_mapping;
+    protected $_mapping;
 
     /**
      * Constructor.
diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Data/Query/History/BaseTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Data/Query/History/BaseTest.php
index 268c7f1a5c2..b5d307de709 100644
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Data/Query/History/BaseTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Data/Query/History/BaseTest.php
@@ -307,18 +307,18 @@ public function testModifyActionOnObjectRecreation()
         $this->assertEquals(true, $found_add);
     }
 
-    private function _getData()
+    protected function _getData()
     {
         return $this->_getFolder()->getData('INBOX/History');
     }
 
-    private function _getDataQuery()
+    protected function _getDataQuery()
     {
         return $this->_getData()
             ->getQuery(Horde_Kolab_Storage_Data::QUERY_HISTORY);
     }
 
-    private function _getFolder()
+    protected function _getFolder()
     {
         return $this->_getFolderBase(
             array(
@@ -336,7 +336,7 @@ private function _getFolder()
         );
     }
 
-    private function _getFolderBase($additional_folders)
+    protected function _getFolderBase($additional_folders)
     {
         $this->history = new Horde_History_Mock('test');
         return $this->getDataStorage(