diff --git a/tests/ZendTest/Paginator/AdapterPluginManagerTest.php b/tests/ZendTest/Paginator/AdapterPluginManagerTest.php
index 3bf90a97172..a7ae11e3128 100644
--- a/tests/ZendTest/Paginator/AdapterPluginManagerTest.php
+++ b/tests/ZendTest/Paginator/AdapterPluginManagerTest.php
@@ -18,7 +18,7 @@
  * @subpackage UnitTests
  * @group      Zend_Paginator
  */
-class FactoryTest extends \PHPUnit_Framework_TestCase
+class AdapterPluginManagerTest extends \PHPUnit_Framework_TestCase
 {
     protected $adapaterPluginManager;
     
diff --git a/tests/ZendTest/Paginator/FactoryTest.php b/tests/ZendTest/Paginator/FactoryTest.php
index 8cf9eff9a72..9cd090e00b6 100644
--- a/tests/ZendTest/Paginator/FactoryTest.php
+++ b/tests/ZendTest/Paginator/FactoryTest.php
@@ -12,6 +12,7 @@
 
 use Zend\Paginator;
 use Zend\Paginator\Adapter;
+use ZendTest\Paginator\TestAsset\TestArrayAggregate;
 
 /**
  * @category   Zend
@@ -42,12 +43,4 @@ public function testCanFactoryPaginatorWithStringAdapterAggregate()
         $paginator = Paginator\Factory::Factory(null, new TestArrayAggregate);
         $this->assertInstanceOf('Zend\Paginator\Adapter\ArrayAdapter', $paginator->getAdapter());
     }
-}
-
-class TestArrayAggregate implements Paginator\AdapterAggregateInterface
-{
-    public function getPaginatorAdapter()
-    {
-        return new Adapter\ArrayAdapter(array(1, 2, 3, 4));
-    }
 }
\ No newline at end of file
diff --git a/tests/ZendTest/Paginator/PaginatorTest.php b/tests/ZendTest/Paginator/PaginatorTest.php
index 23a724bd6c6..3ff4d4c15b6 100644
--- a/tests/ZendTest/Paginator/PaginatorTest.php
+++ b/tests/ZendTest/Paginator/PaginatorTest.php
@@ -23,6 +23,7 @@
 use Zend\Paginator\Exception;
 use Zend\View;
 use Zend\View\Helper;
+use ZendTest\Paginator\TestAsset\TestArrayAggregate;
 
 /**
  * @category   Zend
@@ -796,11 +797,3 @@ public function testGetCacheId()
     }
 
 }
-
-class TestArrayAggregate implements Paginator\AdapterAggregateInterface
-{
-    public function getPaginatorAdapter()
-    {
-        return new Adapter\ArrayAdapter(array(1, 2, 3, 4));
-    }
-}
diff --git a/tests/ZendTest/Paginator/TestAsset/TestArrayAggregate.php b/tests/ZendTest/Paginator/TestAsset/TestArrayAggregate.php
new file mode 100644
index 00000000000..b90f0e8f423
--- /dev/null
+++ b/tests/ZendTest/Paginator/TestAsset/TestArrayAggregate.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Paginator
+ */
+
+namespace ZendTest\Paginator\TestAsset;
+
+use Zend\Paginator;
+use Zend\Paginator\Adapter;
+
+/**
+ * @category   Zend
+ * @package    Zend_Paginator
+ * @subpackage UnitTests
+ */
+class TestArrayAggregate implements Paginator\AdapterAggregateInterface
+{
+    public function getPaginatorAdapter()
+    {
+        return new Adapter\ArrayAdapter(array(1, 2, 3, 4));
+    }
+}