diff --git a/test/AbstractPluginManagerTest.php b/test/AbstractPluginManagerTest.php
index 6d151221..1d8f2b31 100644
--- a/test/AbstractPluginManagerTest.php
+++ b/test/AbstractPluginManagerTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager;
diff --git a/test/Proxy/LazyServiceFactoryFactoryTest.php b/test/Proxy/LazyServiceFactoryFactoryTest.php
index 8af69087..5cae6c46 100644
--- a/test/Proxy/LazyServiceFactoryFactoryTest.php
+++ b/test/Proxy/LazyServiceFactoryFactoryTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\Proxy;
diff --git a/test/Proxy/LazyServiceFactoryTest.php b/test/Proxy/LazyServiceFactoryTest.php
index 0d7d1ab1..ccfaa4a7 100644
--- a/test/Proxy/LazyServiceFactoryTest.php
+++ b/test/Proxy/LazyServiceFactoryTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\Proxy;
diff --git a/test/TestAsset/FooCounterAbstractFactory.php b/test/TestAsset/FooCounterAbstractFactory.php
index 5517be86..7e81882c 100644
--- a/test/TestAsset/FooCounterAbstractFactory.php
+++ b/test/TestAsset/FooCounterAbstractFactory.php
@@ -27,7 +27,7 @@ class FooCounterAbstractFactory implements AbstractFactoryInterface
      */
     public function __construct()
     {
-        self::$instantiationCount += 1;
+        static::$instantiationCount += 1;
     }
 
     /**
diff --git a/test/TestAsset/FooPluginManager.php b/test/TestAsset/FooPluginManager.php
index c756e0ac..39ee3ca3 100644
--- a/test/TestAsset/FooPluginManager.php
+++ b/test/TestAsset/FooPluginManager.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\TestAsset;
diff --git a/test/TestAsset/MockSelfReturningDelegatorFactory.php b/test/TestAsset/MockSelfReturningDelegatorFactory.php
index 2bf70697..9f48cfaf 100644
--- a/test/TestAsset/MockSelfReturningDelegatorFactory.php
+++ b/test/TestAsset/MockSelfReturningDelegatorFactory.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_ServiceManager
  */
 
 namespace ZendTest\ServiceManager\TestAsset;