diff --git a/test/BigIntegerValueTest.php b/test/BigIntegerValueTest.php
index 70e5fcc..9ebb5a5 100644
--- a/test/BigIntegerValueTest.php
+++ b/test/BigIntegerValueTest.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_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -16,9 +15,6 @@
 use Zend\XmlRpc\Generator\GeneratorInterface as Generator;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class BigIntegerValueTest extends \PHPUnit_Framework_TestCase
diff --git a/test/ClientTest.php b/test/ClientTest.php
index 60f804d..5d7d3c7 100644
--- a/test/ClientTest.php
+++ b/test/ClientTest.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_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -19,9 +18,6 @@
 use Zend\XmlRpc;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class ClientTest extends \PHPUnit_Framework_TestCase
diff --git a/test/FaultTest.php b/test/FaultTest.php
index 59bc1ce..1361c29 100644
--- a/test/FaultTest.php
+++ b/test/FaultTest.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_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -14,9 +13,6 @@
 use Zend\XmlRpc;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class FaultTest extends \PHPUnit_Framework_TestCase
diff --git a/test/GeneratorTest.php b/test/GeneratorTest.php
index a36f847..240ffe4 100644
--- a/test/GeneratorTest.php
+++ b/test/GeneratorTest.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_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -13,9 +12,6 @@
 use Zend\XmlRpc\Generator\GeneratorInterface as Generator;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class GeneratorTest extends \PHPUnit_Framework_TestCase
diff --git a/test/Request/HttpTest.php b/test/Request/HttpTest.php
index ab833bc..9bccd13 100644
--- a/test/Request/HttpTest.php
+++ b/test/Request/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_XmlRpc
  */
 
 namespace ZendTest\XmlRpc\Request;
@@ -14,9 +13,6 @@
 use ZendTest\AllTests\StreamWrapper\PHPInput;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class HTTPTest extends \PHPUnit_Framework_TestCase
diff --git a/test/RequestTest.php b/test/RequestTest.php
index 3aa2f8f..558ecf0 100644
--- a/test/RequestTest.php
+++ b/test/RequestTest.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_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -15,9 +14,6 @@
 use Zend\XmlRpc\Value;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class RequestTest extends \PHPUnit_Framework_TestCase
diff --git a/test/ResponseTest.php b/test/ResponseTest.php
index 0e33233..67393d9 100644
--- a/test/ResponseTest.php
+++ b/test/ResponseTest.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_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -14,9 +13,6 @@
 use Zend\XmlRpc\AbstractValue;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class ResponseTest extends \PHPUnit_Framework_TestCase
diff --git a/test/Server/CacheTest.php b/test/Server/CacheTest.php
index c05793d..4308096 100644
--- a/test/Server/CacheTest.php
+++ b/test/Server/CacheTest.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_XmlRpc
  */
 
 namespace ZendTest\XmlRpc\Server;
@@ -13,9 +12,6 @@
 use Zend\XmlRpc\Server;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class CacheTest extends \PHPUnit_Framework_TestCase
diff --git a/test/Server/FaultTest.php b/test/Server/FaultTest.php
index f326a6e..268186f 100644
--- a/test/Server/FaultTest.php
+++ b/test/Server/FaultTest.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_XmlRpc
  */
 
 namespace ZendTest\XmlRpc\Server;
@@ -13,9 +12,6 @@
 use Zend\XmlRpc\Server;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class FaultTest extends \PHPUnit_Framework_TestCase
diff --git a/test/ServerTest.php b/test/ServerTest.php
index a9bcf04..45dfbbf 100644
--- a/test/ServerTest.php
+++ b/test/ServerTest.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_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -19,9 +18,6 @@
 use Zend\XmlRpc;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class ServerTest extends \PHPUnit_Framework_TestCase
diff --git a/test/TestProvider.php b/test/TestProvider.php
index 47c2e6b..6239179 100644
--- a/test/TestProvider.php
+++ b/test/TestProvider.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_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
diff --git a/test/ValueTest.php b/test/ValueTest.php
index 24c6356..7ecb04e 100644
--- a/test/ValueTest.php
+++ b/test/ValueTest.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_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -19,9 +18,6 @@
 /**
  * Test case for Value
  *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class ValueTest extends \PHPUnit_Framework_TestCase