diff --git a/test/FileTest.php b/test/FileTest.php
index dc4c67220..bd0fd6660 100644
--- a/test/FileTest.php
+++ b/test/FileTest.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_Uri
  */
 
 namespace ZendTest\Uri;
@@ -14,9 +13,6 @@
 use PHPUnit_Framework_TestCase as TestCase;
 
 /**
- * @category   Zend
- * @package    Zend_Uri
- * @subpackage UnitTests
  * @group      Zend_Uri
  * @group      Zend_Uri_Http
  * @group      Zend_Http
diff --git a/test/HttpTest.php b/test/HttpTest.php
index a16b9bfcd..633cc6abb 100644
--- a/test/HttpTest.php
+++ b/test/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_Uri
  */
 
 namespace ZendTest\Uri;
@@ -14,9 +13,6 @@
 use PHPUnit_Framework_TestCase as TestCase;
 
 /**
- * @category   Zend
- * @package    Zend_Uri
- * @subpackage UnitTests
  * @group      Zend_Uri
  * @group      Zend_Uri_Http
  * @group      Zend_Http
diff --git a/test/MailtoTest.php b/test/MailtoTest.php
index e38a5d16c..108ac490d 100644
--- a/test/MailtoTest.php
+++ b/test/MailtoTest.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_Uri
  */
 
 namespace ZendTest\Uri;
@@ -14,9 +13,6 @@
 use PHPUnit_Framework_TestCase as TestCase;
 
 /**
- * @category   Zend
- * @package    Zend_Uri
- * @subpackage UnitTests
  * @group      Zend_Uri
  * @group      Zend_Uri_Http
  * @group      Zend_Http
diff --git a/test/UriFactoryTest.php b/test/UriFactoryTest.php
index 4ae3a6fc8..d6ab37da6 100644
--- a/test/UriFactoryTest.php
+++ b/test/UriFactoryTest.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_Uri
  */
 
 namespace ZendTest\Uri;
@@ -13,9 +12,6 @@
 use Zend\Uri\UriFactory;
 
 /**
- * @category   Zend
- * @package    Zend_Uri
- * @subpackage UnitTests
  * @group      Zend_Uri
  */
 class UriFactoryTest extends \PHPUnit_Framework_TestCase
diff --git a/test/UriTest.php b/test/UriTest.php
index de20b69ff..97a826065 100644
--- a/test/UriTest.php
+++ b/test/UriTest.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_Uri
  */
 
 namespace ZendTest\Uri;
@@ -13,9 +12,6 @@
 use Zend\Uri\Uri;
 
 /**
- * @category   Zend
- * @package    Zend_Uri
- * @subpackage UnitTests
  * @group      Zend_Uri
  */
 class UriTest extends \PHPUnit_Framework_TestCase