diff --git a/src/EmailAddress.php b/src/EmailAddress.php
index e362fbdfe..40255e9bb 100644
--- a/src/EmailAddress.php
+++ b/src/EmailAddress.php
@@ -337,15 +337,12 @@ protected function validateLocalPart()
         if (preg_match('/^[' . $atext . ']+(\x2e+[' . $atext . ']+)*$/', $this->localPart)) {
             $result = true;
         } else {
-            // Try quoted string format
-
-            // Quoted-string characters are: DQUOTE *([FWS] qtext/quoted-pair) [FWS] DQUOTE
-            // qtext: Non white space controls, and the rest of the US-ASCII characters not
-            //   including "\" or the quote character
-            $noWsCtl = '\x01-\x08\x0b\x0c\x0e-\x1f\x7f';
-            $qtext   = $noWsCtl . '\x21\x23-\x5b\x5d-\x7e';
-            $ws      = '\x20\x09';
-            if (preg_match('/^\x22([' . $ws . $qtext . '])*[$ws]?\x22$/', $this->localPart)) {
+            // Try quoted string format (RFC 5321 Chapter 4.1.2)
+
+            // Quoted-string characters are: DQUOTE *(qtext/quoted-pair) DQUOTE
+            $qtext      = '\x20-\x21\x23-\x5b\x5d-\x7e'; // %d32-33 / %d35-91 / %d93-126
+            $quotedPair = '\x20-\x7e'; // %d92 %d32-126
+            if (preg_match('/^"(['. $qtext .']|\x5c[' . $quotedPair . '])*"$/', $this->localPart)) {
                 $result = true;
             } else {
                 $this->error(self::DOT_ATOM);
diff --git a/src/File/Exists.php b/src/File/Exists.php
index bd84320ca..e9bea8c9d 100644
--- a/src/File/Exists.php
+++ b/src/File/Exists.php
@@ -74,7 +74,7 @@ public function getDirectory($asArray = false)
         $asArray   = (bool) $asArray;
         $directory = $this->options['directory'];
         if ($asArray && isset($directory)) {
-            $directory = explode(',', (string)$directory);
+            $directory = explode(',', (string) $directory);
         }
 
         return $directory;
diff --git a/src/File/MimeType.php b/src/File/MimeType.php
index 240d426d5..28a5a3471 100644
--- a/src/File/MimeType.php
+++ b/src/File/MimeType.php
@@ -101,31 +101,31 @@ public function __construct($options = null)
         } elseif (is_string($options)) {
             $this->setMimeType($options);
             $options = array();
-        }
-
-        if (isset($options['magicFile'])) {
-            $this->setMagicFile($options['magicFile']);
-            unset($options['magicFile']);
-        }
+        } elseif (is_array($options)) {
+            if (isset($options['magicFile'])) {
+                $this->setMagicFile($options['magicFile']);
+                unset($options['magicFile']);
+            }
 
-        if (isset($options['enableHeaderCheck'])) {
-            $this->enableHeaderCheck($options['enableHeaderCheck']);
-            unset($options['enableHeaderCheck']);
-        }
+            if (isset($options['enableHeaderCheck'])) {
+                $this->enableHeaderCheck($options['enableHeaderCheck']);
+                unset($options['enableHeaderCheck']);
+            }
 
-        if (array_key_exists('mimeType', $options)) {
-            $this->setMimeType($options['mimeType']);
-            unset($options['mimeType']);
-        }
+            if (array_key_exists('mimeType', $options)) {
+                $this->setMimeType($options['mimeType']);
+                unset($options['mimeType']);
+            }
 
-        // Handle cases where mimetypes are interspersed with options, or
-        // options are simply an array of mime types
-        foreach (array_keys($options) as $key) {
-            if (!is_int($key)) {
-                continue;
+            // Handle cases where mimetypes are interspersed with options, or
+            // options are simply an array of mime types
+            foreach (array_keys($options) as $key) {
+                if (!is_int($key)) {
+                    continue;
+                }
+                $this->addMimeType($options[$key]);
+                unset($options[$key]);
             }
-            $this->addMimeType($options[$key]);
-            unset($options[$key]);
         }
 
         parent::__construct($options);
diff --git a/src/Hostname.php b/src/Hostname.php
index ef66a200a..0ad737218 100644
--- a/src/Hostname.php
+++ b/src/Hostname.php
@@ -405,7 +405,7 @@ public function getIdnCheck()
      * @param  bool $useIdnCheck Set to true to validate IDN domains
      * @return Hostname
      */
-    public function useIdnCheck ($useIdnCheck)
+    public function useIdnCheck($useIdnCheck)
     {
         $this->options['useIdnCheck'] = (bool) $useIdnCheck;
         return $this;
@@ -429,7 +429,7 @@ public function getTldCheck()
      * @param  bool $useTldCheck Set to true to validate TLD elements
      * @return Hostname
      */
-    public function useTldCheck ($useTldCheck)
+    public function useTldCheck($useTldCheck)
     {
         $this->options['useTldCheck'] = (bool) $useTldCheck;
         return $this;
diff --git a/test/AbstractTest.php b/test/AbstractTest.php
index 5dd04689d..d8799021e 100644
--- a/test/AbstractTest.php
+++ b/test/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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -16,9 +15,6 @@
 use Zend\Validator\Hostname;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class AbstractTest extends \PHPUnit_Framework_TestCase
@@ -74,6 +70,10 @@ public function testGlobalDefaultTranslatorNullByDefault()
 
     public function testErrorMessagesAreTranslatedWhenTranslatorPresent()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $loader = new TestAsset\ArrayTranslator();
         $loader->translations = array(
             'fooMessage' => 'This is the translated message for %value%',
@@ -92,6 +92,10 @@ public function testErrorMessagesAreTranslatedWhenTranslatorPresent()
 
     public function testCanTranslateMessagesInsteadOfKeys()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $loader = new TestAsset\ArrayTranslator();
         $loader->translations = array(
             '%value% was passed' => 'This is the translated message for %value%',
@@ -153,6 +157,10 @@ public function testTranslatorEnabledPerDefault()
 
     public function testCanDisableTranslator()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $loader = new TestAsset\ArrayTranslator();
         $loader->translations = array(
             '%value% was passed' => 'This is the translated message for %value%',
diff --git a/test/BarcodeTest.php b/test/BarcodeTest.php
index 00ec4b397..adc1f511d 100644
--- a/test/BarcodeTest.php
+++ b/test/BarcodeTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -15,9 +14,6 @@
 /**
  * \Zend\Barcode
  *
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class BarcodeTest extends \PHPUnit_Framework_TestCase
diff --git a/test/BetweenTest.php b/test/BetweenTest.php
index 8d822d3cf..a0c8c880f 100644
--- a/test/BetweenTest.php
+++ b/test/BetweenTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\Between;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class BetweenTest extends \PHPUnit_Framework_TestCase
diff --git a/test/CallbackTest.php b/test/CallbackTest.php
index cd908e40c..f6af52346 100644
--- a/test/CallbackTest.php
+++ b/test/CallbackTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\Callback;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class CallbackTest extends \PHPUnit_Framework_TestCase
diff --git a/test/CreditCardTest.php b/test/CreditCardTest.php
index 9c137229d..953fe1f99 100644
--- a/test/CreditCardTest.php
+++ b/test/CreditCardTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -14,9 +13,6 @@
 use Zend\Validator\CreditCard;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class CreditCardTest extends \PHPUnit_Framework_TestCase
diff --git a/test/CsrfTest.php b/test/CsrfTest.php
index 433d4165d..27fe3127c 100644
--- a/test/CsrfTest.php
+++ b/test/CsrfTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -17,9 +16,6 @@
 /**
  * Zend\Csrf
  *
- * @category   Zend
- * @package    Zend
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class CsrfTest extends \PHPUnit_Framework_TestCase
diff --git a/test/DateStepTest.php b/test/DateStepTest.php
index f7bf1eace..2fb6530dc 100644
--- a/test/DateStepTest.php
+++ b/test/DateStepTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -15,9 +14,6 @@
 use DateInterval;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class DateStepTest extends \PHPUnit_Framework_TestCase
diff --git a/test/DateTest.php b/test/DateTest.php
index 53236afd6..311fd81b8 100644
--- a/test/DateTest.php
+++ b/test/DateTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -15,9 +14,6 @@
 use Zend\Validator;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class DateTest extends \PHPUnit_Framework_TestCase
diff --git a/test/Db/NoRecordExistsTest.php b/test/Db/NoRecordExistsTest.php
index e6d33959d..5d33159fd 100644
--- a/test/Db/NoRecordExistsTest.php
+++ b/test/Db/NoRecordExistsTest.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_Validator
  */
 
 namespace ZendTest\Validator\Db;
@@ -15,9 +14,6 @@
 use ArrayObject;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class NoRecordExistsTest extends \PHPUnit_Framework_TestCase
diff --git a/test/Db/RecordExistsTest.php b/test/Db/RecordExistsTest.php
index d455724e5..e1d6812b1 100644
--- a/test/Db/RecordExistsTest.php
+++ b/test/Db/RecordExistsTest.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_Validator
  */
 
 namespace ZendTest\Validator\Db;
@@ -18,9 +17,6 @@
 use ZendTest\Db\TestAsset\TrustingSql92Platform;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class RecordExistsTest extends \PHPUnit_Framework_TestCase
diff --git a/test/DigitsTest.php b/test/DigitsTest.php
index 3cd6666be..c20fe0c87 100644
--- a/test/DigitsTest.php
+++ b/test/DigitsTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\Digits;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class DigitsTest extends \PHPUnit_Framework_TestCase
diff --git a/test/EmailAddressTest.php b/test/EmailAddressTest.php
index 9f8306a01..ebb501f7e 100644
--- a/test/EmailAddressTest.php
+++ b/test/EmailAddressTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -14,9 +13,6 @@
 use Zend\Validator\Hostname;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class EmailAddressTest extends \PHPUnit_Framework_TestCase
@@ -157,6 +153,19 @@ public function testHostnameInvalid()
     public function testQuotedString()
     {
         $emailAddresses = array(
+            '""@domain.com', // Optional
+            '" "@domain.com', // x20
+            '"!"@domain.com', // x21
+            '"\""@domain.com', // \" (escaped x22)
+            '"#"@domain.com', // x23
+            '"$"@domain.com', // x24
+            '"Z"@domain.com', // x5A
+            '"["@domain.com', // x5B
+            '"\\\"@domain.com', // \\ (escaped x5C)
+            '"]"@domain.com', // x5D
+            '"^"@domain.com', // x5E
+            '"}"@domain.com', // x7D
+            '"~"@domain.com', // x7E
             '"username"@example.com',
             '"bob%jones"@domain.com',
             '"bob jones"@domain.com',
@@ -170,6 +179,28 @@ public function testQuotedString()
         }
     }
 
+    /**
+     * Ensures that quoted-string local part is considered invalid
+     *
+     * @return void
+     */
+    public function testInvalidQuotedString()
+    {
+        $emailAddresses = array(
+            "\"\x00\"@example.com",
+            "\"\x01\"@example.com",
+            "\"\x1E\"@example.com",
+            "\"\x1F\"@example.com",
+            '"""@example.com', // x22 (not escaped)
+            '"\"@example.com', // x5C (not escaped)
+            "\"\x7F\"@example.com",
+            );
+        foreach ($emailAddresses as $input) {
+            $this->assertFalse($this->validator->isValid($input), "$input failed to pass validation:\n"
+                            . implode("\n", $this->validator->getMessages()));
+        }
+    }
+
     /**
      * Ensures that validation fails when the e-mail is given as for display,
      * with angle brackets around the actual address
@@ -382,6 +413,10 @@ public function testGetMessages()
      */
     public function testHostnameValidatorMessagesShouldBeTranslated()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $hostnameValidator = new Hostname();
         $translations = array(
             'hostnameIpAddressNotAllowed'   => 'hostnameIpAddressNotAllowed translation',
diff --git a/test/ExplodeTest.php b/test/ExplodeTest.php
index 8cded098e..229eb6f07 100644
--- a/test/ExplodeTest.php
+++ b/test/ExplodeTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\Explode;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class ExplodeTest extends \PHPUnit_Framework_TestCase
diff --git a/test/File/CountTest.php b/test/File/CountTest.php
index 479658287..8428237b5 100644
--- a/test/File/CountTest.php
+++ b/test/File/CountTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -14,9 +13,6 @@
 use Zend\Validator;
 
 /**
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class CountTest extends \PHPUnit_Framework_TestCase
diff --git a/test/File/Crc32Test.php b/test/File/Crc32Test.php
index 1aad8e750..f5a850ecc 100644
--- a/test/File/Crc32Test.php
+++ b/test/File/Crc32Test.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -13,9 +12,6 @@
 use Zend\Validator\File;
 
 /**
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class Crc32Test extends \PHPUnit_Framework_TestCase
diff --git a/test/File/ExcludeExtensionTest.php b/test/File/ExcludeExtensionTest.php
index dd9190b7d..dd6c44a03 100644
--- a/test/File/ExcludeExtensionTest.php
+++ b/test/File/ExcludeExtensionTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -13,9 +12,6 @@
 use Zend\Validator\File;
 
 /**
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class ExcludeExtensionTest extends \PHPUnit_Framework_TestCase
diff --git a/test/File/ExcludeMimeTypeTest.php b/test/File/ExcludeMimeTypeTest.php
index dd5c5f394..205a486de 100644
--- a/test/File/ExcludeMimeTypeTest.php
+++ b/test/File/ExcludeMimeTypeTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -15,9 +14,6 @@
 /**
  * ExcludeMimeType testbed
  *
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class ExcludeMimeTypeTest extends \PHPUnit_Framework_TestCase
diff --git a/test/File/ExistsTest.php b/test/File/ExistsTest.php
index 970338eff..5fa248006 100644
--- a/test/File/ExistsTest.php
+++ b/test/File/ExistsTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -13,9 +12,6 @@
 use Zend\Validator\File;
 
 /**
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class ExistsTest extends \PHPUnit_Framework_TestCase
diff --git a/test/File/ExtensionTest.php b/test/File/ExtensionTest.php
index 7dbbe184d..9738071e0 100644
--- a/test/File/ExtensionTest.php
+++ b/test/File/ExtensionTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -13,9 +12,6 @@
 use Zend\Validator\File;
 
 /**
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class ExtensionTest extends \PHPUnit_Framework_TestCase
diff --git a/test/File/FilesSizeTest.php b/test/File/FilesSizeTest.php
index 380c414a5..34ab38cb4 100644
--- a/test/File/FilesSizeTest.php
+++ b/test/File/FilesSizeTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -14,9 +13,6 @@
 use Zend\Validator;
 
 /**
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class FilesSizeTest extends \PHPUnit_Framework_TestCase
diff --git a/test/File/HashTest.php b/test/File/HashTest.php
index 40853208c..cb5596492 100644
--- a/test/File/HashTest.php
+++ b/test/File/HashTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -15,9 +14,6 @@
 /**
  * Hash testbed
  *
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class HashTest extends \PHPUnit_Framework_TestCase
diff --git a/test/File/ImageSizeTest.php b/test/File/ImageSizeTest.php
index 16fb92bfa..cc7c3d83a 100644
--- a/test/File/ImageSizeTest.php
+++ b/test/File/ImageSizeTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -13,9 +12,6 @@
 use Zend\Validator\File;
 
 /**
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class ImageSizeTest extends \PHPUnit_Framework_TestCase
diff --git a/test/File/IsCompressedTest.php b/test/File/IsCompressedTest.php
index 690fd4eea..e9a70ccfc 100644
--- a/test/File/IsCompressedTest.php
+++ b/test/File/IsCompressedTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -15,9 +14,6 @@
 /**
  * IsCompressed testbed
  *
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class IsCompressedTest extends \PHPUnit_Framework_TestCase
@@ -26,7 +22,7 @@ protected function getMagicMime()
     {
         // As of PHP >= 5.3.11 and >= 5.4.1 the magic database format has changed.
         // http://doc.php.net/downloads/pdf/split/de/File-Information.pdf (page 11)
-        if (version_compare(PHP_VERSION, '5.3.10', '<=')
+        if (version_compare(PHP_VERSION, '5.3.11', '<')
             || (version_compare(PHP_VERSION, '5.4', '>=')
                 && version_compare(PHP_VERSION, '5.4.1', '<'))
         ) {
diff --git a/test/File/IsImageTest.php b/test/File/IsImageTest.php
index e7bcea6ec..6214201e4 100644
--- a/test/File/IsImageTest.php
+++ b/test/File/IsImageTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -15,9 +14,6 @@
 /**
  * IsImage testbed
  *
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class IsImageTest extends \PHPUnit_Framework_TestCase
@@ -26,8 +22,10 @@ protected function getMagicMime()
     {
         // As of PHP >= 5.3.11 and >= 5.4.1 the magic database format has changed.
         // http://doc.php.net/downloads/pdf/split/de/File-Information.pdf (page 11)
-        if (version_compare(PHP_VERSION, '5.3.10', '<=') || (version_compare(PHP_VERSION, '5.4', '>=') &&
-                                                             version_compare(PHP_VERSION, '5.4.1', '<'))) {
+        if (version_compare(PHP_VERSION, '5.3.11', '<')
+            || (version_compare(PHP_VERSION, '5.4', '>=')
+                && version_compare(PHP_VERSION, '5.4.1', '<'))
+        ) {
             return __DIR__ . '/_files/magic.lte.5.3.10.mime';
         }
 
diff --git a/test/File/Md5Test.php b/test/File/Md5Test.php
index 620d651a9..b41eba332 100644
--- a/test/File/Md5Test.php
+++ b/test/File/Md5Test.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -15,9 +14,6 @@
 /**
  * Md5 testbed
  *
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class Md5Test extends \PHPUnit_Framework_TestCase
diff --git a/test/File/MimeTypeTest.php b/test/File/MimeTypeTest.php
index b423e2784..942fe8add 100644
--- a/test/File/MimeTypeTest.php
+++ b/test/File/MimeTypeTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -16,9 +15,6 @@
 /**
  * MimeType testbed
  *
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class MimeTypeTest extends \PHPUnit_Framework_TestCase
diff --git a/test/File/NotExistsTest.php b/test/File/NotExistsTest.php
index bf76486c5..2cc5ed501 100644
--- a/test/File/NotExistsTest.php
+++ b/test/File/NotExistsTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -15,9 +14,6 @@
 /**
  * NotExists testbed
  *
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class NotExistsTest extends \PHPUnit_Framework_TestCase
diff --git a/test/File/Sha1Test.php b/test/File/Sha1Test.php
index 07b4c66d5..b15f33ed8 100644
--- a/test/File/Sha1Test.php
+++ b/test/File/Sha1Test.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -15,9 +14,6 @@
 /**
  * Sha1 testbed
  *
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class Sha1Test extends \PHPUnit_Framework_TestCase
diff --git a/test/File/SizeTest.php b/test/File/SizeTest.php
index 8c72e636a..1bcce680a 100644
--- a/test/File/SizeTest.php
+++ b/test/File/SizeTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -14,9 +13,6 @@
 use Zend\Validator;
 
 /**
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class SizeTest extends \PHPUnit_Framework_TestCase
diff --git a/test/File/UploadFileTest.php b/test/File/UploadFileTest.php
index 818b1f311..5db211c33 100644
--- a/test/File/UploadFileTest.php
+++ b/test/File/UploadFileTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -13,9 +12,6 @@
 use Zend\Validator\File;
 
 /**
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class UploadFileTest extends \PHPUnit_Framework_TestCase
diff --git a/test/File/UploadTest.php b/test/File/UploadTest.php
index 367f39cf1..aa18f6a39 100644
--- a/test/File/UploadTest.php
+++ b/test/File/UploadTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -13,9 +12,6 @@
 use Zend\Validator\File;
 
 /**
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class UploadTest extends \PHPUnit_Framework_TestCase
diff --git a/test/File/WordCountTest.php b/test/File/WordCountTest.php
index 767534359..e5c47c101 100644
--- a/test/File/WordCountTest.php
+++ b/test/File/WordCountTest.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_Validator
  */
 
 namespace ZendTest\Validator\File;
@@ -14,9 +13,6 @@
 use Zend\Validator;
 
 /**
- * @category   Zend
- * @package    Zend_Validator_File
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class WordCountTest extends \PHPUnit_Framework_TestCase
diff --git a/test/GreaterThanTest.php b/test/GreaterThanTest.php
index 32658b1d8..66d54b17b 100644
--- a/test/GreaterThanTest.php
+++ b/test/GreaterThanTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\GreaterThan;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class GreaterThanTest extends \PHPUnit_Framework_TestCase
diff --git a/test/HexTest.php b/test/HexTest.php
index 5771a5b64..75e5af023 100644
--- a/test/HexTest.php
+++ b/test/HexTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\Hex;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class HexTest extends \PHPUnit_Framework_TestCase
diff --git a/test/HostnameTest.php b/test/HostnameTest.php
index dec347345..9da52a7c5 100644
--- a/test/HostnameTest.php
+++ b/test/HostnameTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\Hostname;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class HostnameTest extends \PHPUnit_Framework_TestCase
@@ -156,10 +152,10 @@ public function testIDN()
     }
 
     /**
-     * Ensure the IDN check works on ressource files as expected
+     * Ensure the IDN check works on resource files as expected
      *
      */
-    public function testRessourceIDN()
+    public function testResourceIDN()
     {
         $validator = new Hostname();
 
@@ -260,6 +256,10 @@ public function testGetAllow()
      */
     public function testValidatorMessagesShouldBeTranslated()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $translations = array(
             'hostnameInvalidLocalName' => 'this is the IP error message',
         );
diff --git a/test/IbanTest.php b/test/IbanTest.php
index 4388c523f..52fa6cc2a 100644
--- a/test/IbanTest.php
+++ b/test/IbanTest.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_I18n
  */
 
 namespace ZendTest\I18n\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\Iban as IbanValidator;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class IbanTest extends \PHPUnit_Framework_TestCase
diff --git a/test/IdenticalTest.php b/test/IdenticalTest.php
index 1d96e4539..b2e3a387a 100644
--- a/test/IdenticalTest.php
+++ b/test/IdenticalTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\Identical;
 
 /**
- * @category   Zend
- * @package    Zend
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class IdenticalTest extends \PHPUnit_Framework_TestCase
diff --git a/test/InArrayTest.php b/test/InArrayTest.php
index 7ce3f0127..c37870a6f 100644
--- a/test/InArrayTest.php
+++ b/test/InArrayTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\InArray;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class InArrayTest extends \PHPUnit_Framework_TestCase
diff --git a/test/IpTest.php b/test/IpTest.php
index fd5a13d79..ef54592c5 100644
--- a/test/IpTest.php
+++ b/test/IpTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\Ip;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class IpTest extends \PHPUnit_Framework_TestCase
diff --git a/test/IsInstanceOfTest.php b/test/IsInstanceOfTest.php
index 71c2b7f18..301a8ade3 100644
--- a/test/IsInstanceOfTest.php
+++ b/test/IsInstanceOfTest.php
@@ -3,9 +3,6 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
@@ -17,9 +14,6 @@
 
 /**
  * @covers     Zend\Validator\IsInstanceOf
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_Validator
@@ -96,4 +90,13 @@ public function testEqualsMessageVariables()
             $validator->getOption('messageVariables')
         );
     }
+
+    public function testPassTraversableToConstructor()
+    {
+        $validator = new Validator\IsInstanceOf(new \ArrayIterator(array('className' => 'DateTime')));
+        $this->assertEquals('DateTime', $validator->getClassName());
+        $this->assertTrue($validator->isValid(new DateTime()));
+        $this->assertFalse($validator->isValid(null));
+        $this->assertFalse($validator->isValid($this));
+    }
 }
diff --git a/test/IsbnTest.php b/test/IsbnTest.php
index 1321128b7..0b84ab325 100644
--- a/test/IsbnTest.php
+++ b/test/IsbnTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -14,9 +13,6 @@
 
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class IsbnTest extends \PHPUnit_Framework_TestCase
diff --git a/test/LessThanTest.php b/test/LessThanTest.php
index eeec1afb2..b1b328165 100644
--- a/test/LessThanTest.php
+++ b/test/LessThanTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\LessThan;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class LessThanTest extends \PHPUnit_Framework_TestCase
diff --git a/test/MessageTest.php b/test/MessageTest.php
index bcf122c22..8a1ef6e1d 100644
--- a/test/MessageTest.php
+++ b/test/MessageTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\StringLength;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class MessageTest extends \PHPUnit_Framework_TestCase
diff --git a/test/NotEmptyTest.php b/test/NotEmptyTest.php
index 2319d8697..c81e50dea 100644
--- a/test/NotEmptyTest.php
+++ b/test/NotEmptyTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -14,9 +13,6 @@
 use Zend\Validator\NotEmpty;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class NotEmptyTest extends \PHPUnit_Framework_TestCase
diff --git a/test/RegexTest.php b/test/RegexTest.php
index 0416dcfa7..ecfebf10f 100644
--- a/test/RegexTest.php
+++ b/test/RegexTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\Regex;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class RegexTest extends \PHPUnit_Framework_TestCase
diff --git a/test/Sitemap/ChangefreqTest.php b/test/Sitemap/ChangefreqTest.php
index 12fd092b1..4ee3dd78e 100644
--- a/test/Sitemap/ChangefreqTest.php
+++ b/test/Sitemap/ChangefreqTest.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_Validator
  */
 
 namespace ZendTest\Validator\Sitemap;
@@ -13,9 +12,6 @@
 use Zend\Validator\Sitemap\Changefreq;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class ChangefreqTest extends \PHPUnit_Framework_TestCase
diff --git a/test/Sitemap/LastmodTest.php b/test/Sitemap/LastmodTest.php
index 9d562c7ba..00404a64a 100644
--- a/test/Sitemap/LastmodTest.php
+++ b/test/Sitemap/LastmodTest.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_Validator
  */
 
 namespace ZendTest\Validator\Sitemap;
@@ -13,9 +12,6 @@
 use Zend\Validator\Sitemap\Lastmod;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class LastmodTest extends \PHPUnit_Framework_TestCase
diff --git a/test/Sitemap/LocTest.php b/test/Sitemap/LocTest.php
index 24f6d1835..9bfef0173 100644
--- a/test/Sitemap/LocTest.php
+++ b/test/Sitemap/LocTest.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_Validator
  */
 
 namespace ZendTest\Validator\Sitemap;
@@ -13,9 +12,6 @@
 use Zend\Validator\Sitemap\Loc;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class LocTest extends \PHPUnit_Framework_TestCase
diff --git a/test/Sitemap/PriorityTest.php b/test/Sitemap/PriorityTest.php
index c2e380727..56eac6e29 100644
--- a/test/Sitemap/PriorityTest.php
+++ b/test/Sitemap/PriorityTest.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_Validator
  */
 
 namespace ZendTest\Validator\Sitemap;
@@ -13,9 +12,6 @@
 use Zend\Validator\Sitemap\Priority;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class PriorityTest extends \PHPUnit_Framework_TestCase
diff --git a/test/StaticValidatorTest.php b/test/StaticValidatorTest.php
index b1220de56..a143761eb 100644
--- a/test/StaticValidatorTest.php
+++ b/test/StaticValidatorTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -17,9 +16,6 @@
 use Zend\Validator\ValidatorPluginManager;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class StaticValidatorTest extends \PHPUnit_Framework_TestCase
@@ -90,6 +86,10 @@ public function testLocalTranslatorPreferredOverGlobalTranslator()
 
     public function testMaximumErrorMessageLength()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->assertEquals(-1, AbstractValidator::getMessageLength());
         AbstractValidator::setMessageLength(10);
         $this->assertEquals(10, AbstractValidator::getMessageLength());
diff --git a/test/StepTest.php b/test/StepTest.php
index d00647e2a..c87bb49e5 100644
--- a/test/StepTest.php
+++ b/test/StepTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -14,9 +13,6 @@
 
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class StepTest extends \PHPUnit_Framework_TestCase
diff --git a/test/StringLengthTest.php b/test/StringLengthTest.php
index 414025e9c..e4e95f7f5 100644
--- a/test/StringLengthTest.php
+++ b/test/StringLengthTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\StringLength;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class StringLengthTest extends \PHPUnit_Framework_TestCase
diff --git a/test/TestAsset/ArrayTranslator.php b/test/TestAsset/ArrayTranslator.php
index 8b67998a6..0933c6acf 100644
--- a/test/TestAsset/ArrayTranslator.php
+++ b/test/TestAsset/ArrayTranslator.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_Validator
  */
 
 namespace ZendTest\Validator\TestAsset;
diff --git a/test/TestAsset/ConcreteValidator.php b/test/TestAsset/ConcreteValidator.php
index 87f84b8e3..7664602c6 100644
--- a/test/TestAsset/ConcreteValidator.php
+++ b/test/TestAsset/ConcreteValidator.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_Validator
  */
 
 namespace ZendTest\Validator\TestAsset;
diff --git a/test/TestAsset/EmailValidatorWithExposedIsReserved.php b/test/TestAsset/EmailValidatorWithExposedIsReserved.php
index 440e40bdb..6e3018a80 100644
--- a/test/TestAsset/EmailValidatorWithExposedIsReserved.php
+++ b/test/TestAsset/EmailValidatorWithExposedIsReserved.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_Validator
  */
 
 namespace ZendTest\Validator\TestAsset;
diff --git a/test/TestAsset/SessionManager.php b/test/TestAsset/SessionManager.php
index e531932fb..cd0bcf672 100644
--- a/test/TestAsset/SessionManager.php
+++ b/test/TestAsset/SessionManager.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_Validator
  */
 
 namespace ZendTest\Validator\TestAsset;
diff --git a/test/UriTest.php b/test/UriTest.php
index 02a47204a..5d6b03ed4 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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -14,9 +13,6 @@
 use Zend\Uri\Exception\InvalidArgumentException;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class UriTest extends \PHPUnit_Framework_TestCase
diff --git a/test/ValidatorChainTest.php b/test/ValidatorChainTest.php
index 4e481b0cc..ab16202ee 100644
--- a/test/ValidatorChainTest.php
+++ b/test/ValidatorChainTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -17,9 +16,6 @@
 use Zend\Validator\ValidatorChain;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class ValidatorChainTest extends \PHPUnit_Framework_TestCase
diff --git a/test/ValidatorPluginManagerTest.php b/test/ValidatorPluginManagerTest.php
index 1ec344454..028fc7446 100644
--- a/test/ValidatorPluginManagerTest.php
+++ b/test/ValidatorPluginManagerTest.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_Validator
  */
 
 namespace ZendTest\Validator;
@@ -13,9 +12,6 @@
 use Zend\Validator\ValidatorPluginManager;
 
 /**
- * @category   Zend
- * @package    Zend_Validator
- * @subpackage UnitTests
  * @group      Zend_Validator
  */
 class ValidatorPluginManagerTest extends \PHPUnit_Framework_TestCase
diff --git a/test/_files/MyBarcode1.php b/test/_files/MyBarcode1.php
index 6d23813e6..e0fcc7197 100644
--- a/test/_files/MyBarcode1.php
+++ b/test/_files/MyBarcode1.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_Validator
  */
 
 namespace Zend\Validator\Barcode;
diff --git a/test/_files/MyBarcode2.php b/test/_files/MyBarcode2.php
index f6b5ce693..1c1040f7d 100644
--- a/test/_files/MyBarcode2.php
+++ b/test/_files/MyBarcode2.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_Validator
  */
 
 namespace Zend\Validator\Barcode;
diff --git a/test/_files/MyBarcode3.php b/test/_files/MyBarcode3.php
index 19a3902d4..e15fd8711 100644
--- a/test/_files/MyBarcode3.php
+++ b/test/_files/MyBarcode3.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_Validator
  */
 
 namespace Zend\Validator\Barcode;
diff --git a/test/_files/MyBarcode4.php b/test/_files/MyBarcode4.php
index 9198dfd8b..1eba3b497 100644
--- a/test/_files/MyBarcode4.php
+++ b/test/_files/MyBarcode4.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_Validator
  */
 
 namespace Zend\Validator\Barcode;
diff --git a/test/_files/MyBarcode5.php b/test/_files/MyBarcode5.php
index 6eed86599..f3199ee94 100644
--- a/test/_files/MyBarcode5.php
+++ b/test/_files/MyBarcode5.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_Validator
  */
 
 namespace Zend\Validator\Barcode;