diff --git a/test/ClassFileLocatorTest.php b/test/ClassFileLocatorTest.php
index d895ccd..2725ff5 100644
--- a/test/ClassFileLocatorTest.php
+++ b/test/ClassFileLocatorTest.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_File
  */
 
 namespace ZendTest\File;
@@ -15,9 +14,6 @@
 /**
  * Test class for Zend\File\ClassFileLocator
  *
- * @category   Zend
- * @package    Zend_File
- * @subpackage UnitTests
  * @group      Zend_File
  */
 class ClassFileLocatorTest extends \PHPUnit_Framework_TestCase
diff --git a/test/TestAsset/LocatorShouldFindThis.php b/test/TestAsset/LocatorShouldFindThis.php
index fbb7098..18632a0 100644
--- a/test/TestAsset/LocatorShouldFindThis.php
+++ b/test/TestAsset/LocatorShouldFindThis.php
@@ -5,15 +5,10 @@
  * @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_File
  */
 
 namespace ZendTest\File\TestAsset;
 
-/**
- * @package    Zend_Loader
- * @subpackage Exception
- */
 interface LocatorShouldFindThis
 {
 }
diff --git a/test/TestAsset/MultipleClassesInMultipleNamespaces.php b/test/TestAsset/MultipleClassesInMultipleNamespaces.php
index d329ee3..82ad688 100644
--- a/test/TestAsset/MultipleClassesInMultipleNamespaces.php
+++ b/test/TestAsset/MultipleClassesInMultipleNamespaces.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_File
  */
 
 namespace ZendTest\File\TestAsset
diff --git a/test/Transfer/Adapter/AbstractAdapterTestMockAdapter.php b/test/Transfer/Adapter/AbstractAdapterTestMockAdapter.php
index fa5fde6..35c33bc 100644
--- a/test/Transfer/Adapter/AbstractAdapterTestMockAdapter.php
+++ b/test/Transfer/Adapter/AbstractAdapterTestMockAdapter.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_File
  */
 
 namespace ZendTest\File\Transfer\Adapter;
@@ -15,9 +14,6 @@
 /**
  * Test class for Zend\File\Transfer\Adapter\AbstractAdapter
  *
- * @category   Zend
- * @package    Zend_File
- * @subpackage UnitTests
  * @group      Zend_File
  */
 class AbstractAdapterTestMockAdapter extends Adapter\AbstractAdapter
diff --git a/test/Transfer/Adapter/AbstractTest.php b/test/Transfer/Adapter/AbstractTest.php
index a593e9a..bd3da75 100644
--- a/test/Transfer/Adapter/AbstractTest.php
+++ b/test/Transfer/Adapter/AbstractTest.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_File
  */
 
 namespace ZendTest\File\Transfer\Adapter;
@@ -20,9 +19,6 @@
 /**
  * Test class for Zend\File\Transfer\Adapter\AbstractAdapter
  *
- * @category   Zend
- * @package    Zend_File
- * @subpackage UnitTests
  * @group      Zend_File
  */
 class AbstractTest extends \PHPUnit_Framework_TestCase
diff --git a/test/Transfer/Adapter/HttpTest.php b/test/Transfer/Adapter/HttpTest.php
index 4ba2a08..0aa2d7c 100644
--- a/test/Transfer/Adapter/HttpTest.php
+++ b/test/Transfer/Adapter/HttpTest.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_File
  */
 
 namespace ZendTest\File\Transfer\Adapter;
@@ -19,9 +18,6 @@
 /**
  * Test class for Zend\File\Transfer\Adapter\Http
  *
- * @category   Zend
- * @package    Zend_File
- * @subpackage UnitTests
  * @group      Zend_File
  */
 class HttpTest extends \PHPUnit_Framework_TestCase
diff --git a/test/Transfer/Adapter/HttpTestMockAdapter.php b/test/Transfer/Adapter/HttpTestMockAdapter.php
index f44b202..311b409 100644
--- a/test/Transfer/Adapter/HttpTestMockAdapter.php
+++ b/test/Transfer/Adapter/HttpTestMockAdapter.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_File
  */
 
 namespace ZendTest\File\Transfer\Adapter;
@@ -15,9 +14,6 @@
 /**
  * Test class for Zend\File\Transfer\Adapter\AbstractAdapter
  *
- * @category   Zend
- * @package    Zend_File
- * @subpackage UnitTests
  * @group      Zend_File
  */
 class HttpTestMockAdapter extends Adapter\Http