diff --git a/.travis.yml b/.travis.yml
index 42736fc1..e36d9e0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,9 @@ cache:
 
 env:
   global:
-    - SERVICE_MANAGER_VERSION="^3.0.3"
+    - COMPOSER_ARGS="--no-interaction"
+    - COVERAGE_DEPS="satooshi/php-coveralls"
+    - LEGACY_DEPS="phpunit/phpunit"
     - SITE_URL: https://zendframework.github.io/zend-mail
     - GH_USER_NAME: "Matthew Weier O'Phinney"
     - GH_USER_EMAIL: matthew@weierophinney.net
@@ -24,29 +26,36 @@ env:
     - secure: "D/LfNRozbXUjssR19Yi+6luLML1XyVhTLaky2FPlFAuWb80viVzTxhlvX1QgWPSxxTH8zLRlPm/71E8wYHTN94UGLwJorOthA/btaWKPtdgJtlHXErSgofVVOUqAObvGFOW9sSSuRZ5gFN0c47uuWJmYbiI3HUQkFMjpGpFatXO1SajzK+dCpN4cuhgHW3T41PNbiG8RRCYeFwGBJdpIXEm3HYN6bAWRbFnnu4uCVnQYZnDn/Rprr8+WIU5JFOJQ7ttCQuq1RMP3EC1fVIr0N5gFL91KYX9EyCYmLpZNMS6kF9cPTRQbMEOcKMXqqfGA031MlhvveeOiVWiap/ScMwpId0ugTq9O+sUvBHZuk4FSRtiURcPTLKAmQfUie8Zb+/dxKI18oOWVLsUU919wAEU/hGeTOvATl0WcjqZ2LmxOLVm6UE8+5kM1FhM04XjQaFSJVWK+Asto9KRrOSd310SMpluATutO2ZSN0r7+a7S65M38RRh63NOtdrtbbYIx7+MdAmfPwH5+wr3gekD0pDgnfQd1zLQNWMF/2idTjoxO6xAxTLvthThf5ANXadz1A2Dwqn1EdGsTJ2QItGO7TFwDE+Wfi1O6vtm2FgEy98vwC0t4D1op+0QSRMPr6lFkzINOv4aVO/SB1NF3zwiB95ZsvqReU/Zj2+aDzltf5tY="
 
 matrix:
+  fast_finish: true
   include:
-    - php: 5.5
-      env:
-        - CS_CHECK=true
-    - php: 5.5
+    - php: 5.6
       env:
-        - SERVICE_MANAGER_VERSION="^2.7.5"
+        - DEPS=lowest
     - php: 5.6
       env:
+        - DEPS=latest
         - TEST_COVERAGE=true
+        - CS_CHECK=true
         - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
         - PATH="$HOME/.local/bin:$PATH"
-    - php: 5.6
-      env:
-        - SERVICE_MANAGER_VERSION="^2.7.5"
     - php: 7
+      env:
+        - DEPS=lowest
     - php: 7
       env:
-        - SERVICE_MANAGER_VERSION="^2.7.5"
-    - php: hhvm 
-    - php: hhvm 
+        - DEPS=latest
+    - php: 7.1
+      env:
+        - DEPS=lowest
+    - php: 7.1
+      env:
+        - DEPS=latest
+    - php: hhvm
+      env:
+        - DEPS=lowest
+    - php: hhvm
       env:
-        - SERVICE_MANAGER_VERSION="^2.7.5"
+        - DEPS=latest
   allow_failures:
     - php: hhvm
 
@@ -55,13 +64,16 @@ notifications:
   email: false
 
 before_install:
-  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - composer self-update
-  - if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
-  - composer require --dev --no-update "zendframework/zend-servicemanager:$SERVICE_MANAGER_VERSION"
+  - travis_retry composer self-update
+  - if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; fi
 
 install:
-  - travis_retry composer install --no-interaction --ignore-platform-reqs
+  - travis_retry composer install $COMPOSER_ARGS
+  - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
+  - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
+  - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+  - composer show
 
 script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ab327f0..fe0e125d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,9 +12,10 @@ All notable changes to this project will be documented in this file, in reverse
   configuration flag and/or the `setuseCompleteQuit($flag)` method to change
   the setting (default is to enable this behavior, which was the previous
   behavior).
-
 - [#128](https://github.com/zendframework/zend-mail/pull/128) adds a
   requirement on ext/iconv, as it is used internally.
+- [#132](https://github.com/zendframework/zend-mail/pull/132) bumps minimum
+  php version to 5.6
 
 ### Deprecated
 
diff --git a/composer.json b/composer.json
index c7727df2..ca3e0a46 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": "^5.5 || ^7.0",
+        "php": "^7.0 || ^5.6",
         "ext-iconv": "*",
         "zendframework/zend-loader": "^2.5",
         "zendframework/zend-mime": "^2.5",
@@ -24,7 +24,7 @@
         "zendframework/zend-config": "^2.6",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
         "zendframework/zend-crypt": "^2.6",
-        "phpunit/phpunit": "^4.8",
+        "phpunit/phpunit": "^6.0.8 || ^5.7.15",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "suggest": {
diff --git a/test/AddressListTest.php b/test/AddressListTest.php
index 87e37ce2..8ba08879 100644
--- a/test/AddressListTest.php
+++ b/test/AddressListTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Address;
 use Zend\Mail\AddressList;
 
@@ -16,7 +17,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\AddressList<extended>
  */
-class AddressListTest extends \PHPUnit_Framework_TestCase
+class AddressListTest extends TestCase
 {
     public function setUp()
     {
diff --git a/test/AddressTest.php b/test/AddressTest.php
index 9ecef278..eaf63be9 100644
--- a/test/AddressTest.php
+++ b/test/AddressTest.php
@@ -9,12 +9,13 @@
 
 namespace ZendTest\Mail;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Address;
 
 /**
  * @covers Zend\Mail\Address<extended>
  */
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
     public function testDoesNotRequireNameForInstantiation()
     {
@@ -44,7 +45,7 @@ public function testToStringCreatesStringRepresentation()
      */
     public function testSetAddressInvalidAddressObject($email, $name)
     {
-        $this->setExpectedException('Zend\Mail\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Exception\InvalidArgumentException');
         new Address($email, $name);
     }
 
diff --git a/test/Header/AddressListHeaderTest.php b/test/Header/AddressListHeaderTest.php
index 6a039115..0bcc92ac 100644
--- a/test/Header/AddressListHeaderTest.php
+++ b/test/Header/AddressListHeaderTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Header;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Address;
 use Zend\Mail\AddressList;
 use Zend\Mail\Header\Bcc;
@@ -20,7 +21,7 @@
 /**
  * @group      Zend_Mail
  */
-class AddressListHeaderTest extends \PHPUnit_Framework_TestCase
+class AddressListHeaderTest extends TestCase
 {
     public static function getHeaderInstances()
     {
diff --git a/test/Header/ContentTransferEncodingTest.php b/test/Header/ContentTransferEncodingTest.php
index 9c62dc4f..f6335774 100644
--- a/test/Header/ContentTransferEncodingTest.php
+++ b/test/Header/ContentTransferEncodingTest.php
@@ -9,13 +9,14 @@
 
 namespace ZendTest\Mail\Header;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Header\ContentTransferEncoding;
 
 /**
  * @group      Zend_Mail
  * @covers Zend\Mail\Header\ContentTransferEncoding<extended>
  */
-class ContentTransferEncodingTest extends \PHPUnit_Framework_TestCase
+class ContentTransferEncodingTest extends TestCase
 {
     public function dataValidEncodings()
     {
@@ -50,7 +51,7 @@ public function testContentTransferEncodingFromStringCreatesValidContentTransfer
      */
     public function testContentTransferEncodingFromStringRaisesException($encoding)
     {
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         $contentTransferEncodingHeader = ContentTransferEncoding::fromString('Content-Transfer-Encoding: '.$encoding);
     }
 
@@ -104,7 +105,7 @@ public function testProvidingParametersIntroducesHeaderFolding()
      */
     public function testFromStringRaisesExceptionOnInvalidHeaderName()
     {
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         ContentTransferEncoding::fromString('Content-Transfer-Encoding' . chr(32) . ': 8bit');
     }
 
@@ -120,11 +121,10 @@ public function headerLines()
     /**
      * @dataProvider headerLines
      * @group ZF2015-04
-     * @expectedException Zend\Mail\Header\Exception\InvalidArgumentException
      */
     public function testFromStringRaisesExceptionForInvalidMultilineValues($headerLine)
     {
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         ContentTransferEncoding::fromString($headerLine);
     }
 
@@ -133,7 +133,8 @@ public function testFromStringRaisesExceptionForInvalidMultilineValues($headerLi
      */
     public function testFromStringRaisesExceptionForContinuations()
     {
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException', 'expects');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('expects');
         ContentTransferEncoding::fromString("Content-Transfer-Encoding: 8bit\r\n 7bit");
     }
 
@@ -143,7 +144,8 @@ public function testFromStringRaisesExceptionForContinuations()
     public function testSetTransferEncodingRaisesExceptionForInvalidValues()
     {
         $header = new ContentTransferEncoding();
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException', 'expects');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('expects');
         $header->setTransferEncoding("8bit\r\n 7bit");
     }
 }
diff --git a/test/Header/ContentTypeTest.php b/test/Header/ContentTypeTest.php
index 9c34c937..20243cfa 100644
--- a/test/Header/ContentTypeTest.php
+++ b/test/Header/ContentTypeTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Header;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Header\ContentType;
 use Zend\Mail\Header\Exception\InvalidArgumentException;
 use Zend\Mail\Header\HeaderInterface;
@@ -18,7 +19,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Header\ContentType<extended>
  */
-class ContentTypeTest extends \PHPUnit_Framework_TestCase
+class ContentTypeTest extends TestCase
 {
     public function testImplementsHeaderInterface()
     {
@@ -85,7 +86,8 @@ public function testSetType($type, $parameters, $fieldValue, $expectedToString)
      */
     public function testFromStringThrowException($headerLine, $expectedException, $exceptionMessage)
     {
-        $this->setExpectedException($expectedException, $exceptionMessage);
+        $this->expectException($expectedException);
+        $this->expectExceptionMessage($exceptionMessage);
         ContentType::fromString($headerLine);
     }
 
@@ -107,7 +109,8 @@ public function testAddParameterThrowException($paramName, $paramValue, $expecte
         $header = new ContentType();
         $header->setType('text/html');
 
-        $this->setExpectedException($expectedException, $exceptionMessage);
+        $this->expectException($expectedException);
+        $this->expectExceptionMessage($exceptionMessage);
         $header->addParameter($paramName, $paramValue);
     }
 
diff --git a/test/Header/DateTest.php b/test/Header/DateTest.php
index 5b5f7771..24e01b68 100644
--- a/test/Header/DateTest.php
+++ b/test/Header/DateTest.php
@@ -9,7 +9,7 @@
 
 namespace ZendTest\Mail\Header;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Header;
 
 /**
@@ -33,7 +33,7 @@ public function headerLines()
      */
     public function testFromStringRaisesExceptionOnCrlfInjectionAttempt($header)
     {
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         Header\Date::fromString($header);
     }
 
@@ -42,7 +42,7 @@ public function testFromStringRaisesExceptionOnCrlfInjectionAttempt($header)
      */
     public function testPreventsCRLFInjectionViaConstructor()
     {
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         $address = new Header\Date("This\ris\r\na\nCRLF Attack");
     }
 }
diff --git a/test/Header/GenericHeaderTest.php b/test/Header/GenericHeaderTest.php
index 76536038..8711d42d 100644
--- a/test/Header/GenericHeaderTest.php
+++ b/test/Header/GenericHeaderTest.php
@@ -9,7 +9,7 @@
 
 namespace ZendTest\Mail\Header;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Header\GenericHeader;
 
 /**
@@ -22,7 +22,7 @@ class GenericHeaderTest extends TestCase
      */
     public function testSplitHeaderLineRaisesExceptionOnInvalidHeader()
     {
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         GenericHeader::splitHeaderLine(
             'Content-Type' . chr(32) . ': text/html; charset = "iso-8859-1"' . "\nThis is a test"
         );
@@ -43,7 +43,8 @@ public function fieldNames()
     public function testRaisesExceptionOnInvalidFieldName($fieldName)
     {
         $header = new GenericHeader();
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException', 'name');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('name');
         $header->setFieldName($fieldName);
     }
 
diff --git a/test/Header/HeaderNameTest.php b/test/Header/HeaderNameTest.php
index 73994a73..418f32e0 100644
--- a/test/Header/HeaderNameTest.php
+++ b/test/Header/HeaderNameTest.php
@@ -9,7 +9,7 @@
 
 namespace ZendTest\Mail\Header;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Header\HeaderName;
 
 /**
@@ -80,7 +80,8 @@ public function assertNames()
      */
     public function testAssertValidRaisesExceptionForInvalidNames($name)
     {
-        $this->setExpectedException('Zend\Mail\Header\Exception\RuntimeException', 'Invalid');
+        $this->expectException('Zend\Mail\Header\Exception\RuntimeException');
+        $this->expectExceptionMessage('Invalid');
         HeaderName::assertValid($name);
     }
 }
diff --git a/test/Header/HeaderValueTest.php b/test/Header/HeaderValueTest.php
index 8dfa091e..ff09b7f1 100644
--- a/test/Header/HeaderValueTest.php
+++ b/test/Header/HeaderValueTest.php
@@ -9,7 +9,7 @@
 
 namespace ZendTest\Mail\Header;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use Zend\Mail\Header\HeaderValue;
 
@@ -101,7 +101,8 @@ public function assertValues()
      */
     public function testAssertValidRaisesExceptionForInvalidValues($value)
     {
-        $this->setExpectedException('Zend\Mail\Header\Exception\RuntimeException', 'Invalid');
+        $this->expectException('Zend\Mail\Header\Exception\RuntimeException');
+        $this->expectExceptionMessage('Invalid');
         HeaderValue::assertValid($value);
     }
 }
diff --git a/test/Header/HeaderWrapTest.php b/test/Header/HeaderWrapTest.php
index 3ea739df..7f728ec7 100644
--- a/test/Header/HeaderWrapTest.php
+++ b/test/Header/HeaderWrapTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Header;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Header\GenericHeader;
 use Zend\Mail\Header\HeaderWrap;
 
@@ -16,12 +17,12 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Header\HeaderWrap<extended>
  */
-class HeaderWrapTest extends \PHPUnit_Framework_TestCase
+class HeaderWrapTest extends TestCase
 {
     public function testWrapUnstructuredHeaderAscii()
     {
         $string = str_repeat('foobarblahblahblah baz bat', 4);
-        $header = $this->getMock('Zend\Mail\Header\UnstructuredInterface');
+        $header = $this->createMock('Zend\Mail\Header\UnstructuredInterface');
         $header->expects($this->any())
             ->method('getEncoding')
             ->will($this->returnValue('ASCII'));
@@ -37,7 +38,7 @@ public function testWrapUnstructuredHeaderAscii()
     public function testWrapUnstructuredHeaderMime()
     {
         $string = str_repeat('foobarblahblahblah baz bat', 3);
-        $header = $this->getMock('Zend\Mail\Header\UnstructuredInterface');
+        $header = $this->createMock('Zend\Mail\Header\UnstructuredInterface');
         $header->expects($this->any())
             ->method('getEncoding')
             ->will($this->returnValue('UTF-8'));
diff --git a/test/Header/MessageIdTest.php b/test/Header/MessageIdTest.php
index f7efb8b6..0699fbfe 100644
--- a/test/Header/MessageIdTest.php
+++ b/test/Header/MessageIdTest.php
@@ -9,13 +9,14 @@
 
 namespace ZendTest\Mail\Header;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Header;
 
 /**
  * @group      Zend_Mail
  * @covers Zend\Mail\Header\MessageId<extended>
  */
-class MessageIdTest extends \PHPUnit_Framework_TestCase
+class MessageIdTest extends TestCase
 {
     public function testSettingManually()
     {
@@ -52,7 +53,7 @@ public function headerLines()
      */
     public function testFromStringPreventsCrlfInjectionOnDetection($header)
     {
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         $messageid = Header\MessageId::fromString($header);
     }
 
@@ -74,7 +75,7 @@ public function invalidIdentifiers()
     public function testInvalidIdentifierRaisesException($id)
     {
         $header = new Header\MessageId();
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         $header->setId($id);
     }
 }
diff --git a/test/Header/MimeVersionTest.php b/test/Header/MimeVersionTest.php
index 3b535fd0..ce194fb7 100644
--- a/test/Header/MimeVersionTest.php
+++ b/test/Header/MimeVersionTest.php
@@ -9,13 +9,14 @@
 
 namespace ZendTest\Mail\Header;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Header;
 
 /**
  * @group      Zend_Mail
  * @covers Zend\Mail\Header\MimeVersion<extended>
  */
-class MimeVersionTest extends \PHPUnit_Framework_TestCase
+class MimeVersionTest extends TestCase
 {
     public function testSettingManually()
     {
@@ -47,7 +48,7 @@ public function headerLines()
      */
     public function testFromStringRaisesExceptionOnDetectionOfCrlfInjection($header)
     {
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         $mime = Header\MimeVersion::fromString($header);
     }
 
@@ -68,7 +69,7 @@ public function invalidVersions()
     public function testRaisesExceptionOnInvalidVersionFromSetVersion($value)
     {
         $header = new Header\MimeVersion();
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         $header->setVersion($value);
     }
 }
diff --git a/test/Header/ReceivedTest.php b/test/Header/ReceivedTest.php
index ce1e3f8e..c8ec5a0d 100644
--- a/test/Header/ReceivedTest.php
+++ b/test/Header/ReceivedTest.php
@@ -9,13 +9,14 @@
 
 namespace ZendTest\Mail\Header;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Header;
 
 /**
  * @group      Zend_Mail
  * @covers Zend\Mail\Header\Received<extended>
  */
-class ReceivedTest extends \PHPUnit_Framework_TestCase
+class ReceivedTest extends TestCase
 {
     public function testFromStringCreatesValidReceivedHeader()
     {
@@ -67,7 +68,7 @@ public function headerLines()
      */
     public function testRaisesExceptionViaFromStringOnDetectionOfCrlfInjection($header)
     {
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         $received = Header\Received::fromString($header);
     }
 
@@ -87,7 +88,7 @@ public function invalidValues()
      */
     public function testConstructorRaisesExceptionOnValueWithCRLFInjectionAttempt($value)
     {
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         new Header\Received($value);
     }
 }
diff --git a/test/Header/SenderTest.php b/test/Header/SenderTest.php
index 7b0addfa..9f773647 100644
--- a/test/Header/SenderTest.php
+++ b/test/Header/SenderTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Header;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Address;
 use Zend\Mail\Header;
 use Zend\Mail\Exception;
@@ -17,7 +18,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Header\Sender<extended>
  */
-class SenderTest extends \PHPUnit_Framework_TestCase
+class SenderTest extends TestCase
 {
     public function testFromStringCreatesValidReceivedHeader()
     {
@@ -54,14 +55,12 @@ public function testParseValidSenderHeader($expectedFieldValue, $encodedValue, $
      * @group ZF2015-04
      * @param string $decodedValue
      * @param string $expectedException
-     * @param string|null $expectedExceptionMessage
      */
     public function testParseInvalidSenderHeaderThrowException(
         $decodedValue,
-        $expectedException,
-        $expectedExceptionMessage
+        $expectedException
     ) {
-        $this->setExpectedException($expectedException, $expectedExceptionMessage);
+        $this->expectException($expectedException);
         Header\Sender::fromString('Sender:' . $decodedValue);
     }
 
@@ -93,7 +92,7 @@ public function testSetAddressValidValue($email, $name, $expectedFieldValue, $en
     public function testSetAddressInvalidValue($email, $name)
     {
         $header = new Header\Sender();
-        $this->setExpectedException('Zend\Mail\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Exception\InvalidArgumentException');
         $header->setAddress($email, $name);
     }
 
@@ -190,20 +189,20 @@ public function invalidSenderEncodedDataProvider()
 
         return [
             // Description => [decoded format, exception class, exception message],
-            'Empty' => ['', $mailInvalidArgumentException, null],
-            'any ASCII' => ['azAZ09-_', $mailInvalidArgumentException, null],
-            'any UTF-8' => ['ázÁZ09-_', $mailInvalidArgumentException, null],
-            ["xxx yyy\n", $mailInvalidArgumentException, null],
-            ["xxx yyy\r\n", $mailInvalidArgumentException, null],
-            ["xxx yyy\r\n\r\n", $mailInvalidArgumentException, null],
-            ["xxx\r\ny\r\nyy", $mailInvalidArgumentException, null],
-            ["foo\r\n@\r\nbar", $mailInvalidArgumentException, null],
+            'Empty' => ['', $mailInvalidArgumentException],
+            'any ASCII' => ['azAZ09-_', $mailInvalidArgumentException],
+            'any UTF-8' => ['ázÁZ09-_', $mailInvalidArgumentException],
+            ["xxx yyy\n", $mailInvalidArgumentException],
+            ["xxx yyy\r\n", $mailInvalidArgumentException],
+            ["xxx yyy\r\n\r\n", $mailInvalidArgumentException],
+            ["xxx\r\ny\r\nyy", $mailInvalidArgumentException],
+            ["foo\r\n@\r\nbar", $mailInvalidArgumentException],
 
-            ["ázÁZ09 <foo@bar>", $headerInvalidArgumentException, null],
-            'newline' => ["<foo@bar>\n", $headerInvalidArgumentException, null],
-            'cr-lf' => ["<foo@bar>\r\n", $headerInvalidArgumentException, null],
-            'cr-lf-wsp' => ["<foo@bar>\r\n\r\n", $headerInvalidArgumentException, null],
-            'multiline' => ["<foo\r\n@\r\nbar>", $headerInvalidArgumentException, null],
+            ["ázÁZ09 <foo@bar>", $headerInvalidArgumentException],
+            'newline' => ["<foo@bar>\n", $headerInvalidArgumentException],
+            'cr-lf' => ["<foo@bar>\r\n", $headerInvalidArgumentException],
+            'cr-lf-wsp' => ["<foo@bar>\r\n\r\n", $headerInvalidArgumentException],
+            'multiline' => ["<foo\r\n@\r\nbar>", $headerInvalidArgumentException],
         ];
     }
 
@@ -247,7 +246,8 @@ public function validHeaderLinesProvider()
      */
     public function testFromStringWithInvalidInput($headerString, $expectedException, $expectedMessagePart = '')
     {
-        $this->setExpectedException($expectedException, $expectedMessagePart);
+        $this->expectException($expectedException);
+        $this->expectExceptionMessage($expectedMessagePart);
 
         Header\Sender::fromString($headerString);
     }
diff --git a/test/Header/SubjectTest.php b/test/Header/SubjectTest.php
index 1105830b..0696be29 100644
--- a/test/Header/SubjectTest.php
+++ b/test/Header/SubjectTest.php
@@ -9,13 +9,14 @@
 
 namespace ZendTest\Mail\Header;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Header;
 
 /**
  * @group      Zend_Mail
  * @covers Zend\Mail\Header\Subject<extended>
  */
-class SubjectTest extends \PHPUnit_Framework_TestCase
+class SubjectTest extends TestCase
 {
     public function testHeaderFolding()
     {
@@ -55,7 +56,8 @@ public function testParseInvalidSubjectHeaderThrowException(
         $expectedException,
         $expectedExceptionMessage
     ) {
-        $this->setExpectedException($expectedException, $expectedExceptionMessage);
+        $this->expectException($expectedException);
+        $this->expectExceptionMessage($expectedExceptionMessage);
         Header\Subject::fromString('Subject:' . $decodedValue);
     }
 
diff --git a/test/Header/ToTest.php b/test/Header/ToTest.php
index be59e200..ff4bf784 100644
--- a/test/Header/ToTest.php
+++ b/test/Header/ToTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Header;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Header;
 
 /**
@@ -18,7 +19,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Header\To<extended>
  */
-class ToTest extends \PHPUnit_Framework_TestCase
+class ToTest extends TestCase
 {
     public function testHeaderFoldingOccursProperly()
     {
@@ -48,7 +49,7 @@ public function headerLines()
      */
     public function testFromStringRaisesExceptionWhenCrlfInjectionIsDetected($header)
     {
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         Header\To::fromString($header);
     }
 }
diff --git a/test/HeadersTest.php b/test/HeadersTest.php
index 64cfbccd..3286f17a 100644
--- a/test/HeadersTest.php
+++ b/test/HeadersTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail;
 use Zend\Mail\Header;
 
@@ -16,7 +17,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Headers<extended>
  */
-class HeadersTest extends \PHPUnit_Framework_TestCase
+class HeadersTest extends TestCase
 {
     public function testHeadersImplementsProperClasses()
     {
@@ -74,7 +75,8 @@ public function testHeadersFromStringFactoryCreatesSingleObjectWithHeaderBreakLi
 
     public function testHeadersFromStringFactoryThrowsExceptionOnMalformedHeaderLine()
     {
-        $this->setExpectedException('Zend\Mail\Exception\RuntimeException', 'does not match');
+        $this->expectException('Zend\Mail\Exception\RuntimeException');
+        $this->expectExceptionMessage('does not match');
         Mail\Headers::fromString("Fake = foo-bar\r\n\r\n");
     }
 
@@ -145,10 +147,8 @@ public function testHeadersAggregatesHeaderThroughAddHeaderLine()
 
     public function testHeadersAddHeaderLineThrowsExceptionOnMissingFieldValue()
     {
-        $this->setExpectedException(
-            'Zend\Mail\Header\Exception\InvalidArgumentException',
-            'Header must match with the format "name:value"'
-        );
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Header must match with the format "name:value"');
         $headers = new Mail\Headers();
         $headers->addHeaderLine('Foo');
     }
@@ -193,7 +193,8 @@ public function testHeadersAggregatesHeadersThroughAddHeaders()
 
     public function testHeadersAddHeadersThrowsExceptionOnInvalidArguments()
     {
-        $this->setExpectedException('Zend\Mail\Exception\InvalidArgumentException', 'Expected array or Trav');
+        $this->expectException('Zend\Mail\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage('Expected array or Trav');
         $headers = new Mail\Headers();
         $headers->addHeaders('foo');
     }
@@ -405,7 +406,7 @@ public function testClone()
      */
     public function testHeaderCrLfAttackFromString()
     {
-        $this->setExpectedException('Zend\Mail\Exception\RuntimeException');
+        $this->expectException('Zend\Mail\Exception\RuntimeException');
         Mail\Headers::fromString("Fake: foo-bar\r\n\r\nevilContent");
     }
 
@@ -415,7 +416,7 @@ public function testHeaderCrLfAttackFromString()
     public function testHeaderCrLfAttackAddHeaderLineSingle()
     {
         $headers = new Mail\Headers();
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         $headers->addHeaderLine("Fake: foo-bar\r\n\r\nevilContent");
     }
 
@@ -425,7 +426,7 @@ public function testHeaderCrLfAttackAddHeaderLineSingle()
     public function testHeaderCrLfAttackAddHeaderLineWithValue()
     {
         $headers = new Mail\Headers();
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         $headers->addHeaderLine('Fake', "foo-bar\r\n\r\nevilContent");
     }
 
@@ -435,7 +436,7 @@ public function testHeaderCrLfAttackAddHeaderLineWithValue()
     public function testHeaderCrLfAttackAddHeaderLineMultiple()
     {
         $headers = new Mail\Headers();
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         $headers->addHeaderLine('Fake', ["foo-bar\r\n\r\nevilContent"]);
         $headers->forceLoading();
     }
@@ -446,7 +447,7 @@ public function testHeaderCrLfAttackAddHeaderLineMultiple()
     public function testHeaderCrLfAttackAddHeadersSingle()
     {
         $headers = new Mail\Headers();
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         $headers->addHeaders(["Fake: foo-bar\r\n\r\nevilContent"]);
     }
 
@@ -456,7 +457,7 @@ public function testHeaderCrLfAttackAddHeadersSingle()
     public function testHeaderCrLfAttackAddHeadersWithValue()
     {
         $headers = new Mail\Headers();
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         $headers->addHeaders(['Fake' => "foo-bar\r\n\r\nevilContent"]);
     }
 
@@ -466,7 +467,7 @@ public function testHeaderCrLfAttackAddHeadersWithValue()
     public function testHeaderCrLfAttackAddHeadersMultiple()
     {
         $headers = new Mail\Headers();
-        $this->setExpectedException('Zend\Mail\Header\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Header\Exception\InvalidArgumentException');
         $headers->addHeaders(['Fake' => ["foo-bar\r\n\r\nevilContent"]]);
         $headers->forceLoading();
     }
diff --git a/test/MessageFactoryTest.php b/test/MessageFactoryTest.php
index 594b30c9..cad9faa0 100644
--- a/test/MessageFactoryTest.php
+++ b/test/MessageFactoryTest.php
@@ -9,13 +9,14 @@
 
 namespace ZendTest\Mail;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\MessageFactory;
 
 /**
  * @group      Zend_Mail
  * @covers Zend\Mail\MessageFactory<extended>
  */
-class MessageFactoryTest extends \PHPUnit_Framework_TestCase
+class MessageFactoryTest extends TestCase
 {
     public function testConstructMessageWithOptions()
     {
@@ -117,7 +118,7 @@ public function invalidMessageOptions()
      */
     public function testExceptionForOptionsNotArrayOrTraversable($options)
     {
-        $this->setExpectedException('Zend\Mail\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Exception\InvalidArgumentException');
         MessageFactory::getInstance($options);
     }
 }
diff --git a/test/MessageTest.php b/test/MessageTest.php
index 3662799a..63ff3b16 100644
--- a/test/MessageTest.php
+++ b/test/MessageTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail;
 
+use PHPUnit\Framework\TestCase;
 use stdClass;
 use Zend\Mail\Address;
 use Zend\Mail\AddressList;
@@ -23,7 +24,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Message<extended>
  */
-class MessageTest extends \PHPUnit_Framework_TestCase
+class MessageTest extends TestCase
 {
     /** @var Message */
     public $message;
@@ -532,7 +533,7 @@ public static function invalidBodyValues()
      */
     public function testSettingNonScalarNonMimeNonStringSerializableValueForBodyRaisesException($body)
     {
-        $this->setExpectedException('Zend\Mail\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Exception\InvalidArgumentException');
         $this->message->setBody($body);
     }
 
@@ -757,7 +758,7 @@ public function testRaisesExceptionWhenAttemptingToSerializeMessageWithCRLFInjec
             '',
             '<html><body><iframe src="http://example.com/"></iframe></body></html> <!--',
         ];
-        $this->setExpectedException('Zend\Mail\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Exception\InvalidArgumentException');
         $this->message->{$recipientMethod}(implode(Headers::EOL, $subject));
     }
 
diff --git a/test/Protocol/Smtp/Auth/Crammd5Test.php b/test/Protocol/Smtp/Auth/Crammd5Test.php
index bc3c97a0..b41573e0 100644
--- a/test/Protocol/Smtp/Auth/Crammd5Test.php
+++ b/test/Protocol/Smtp/Auth/Crammd5Test.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Protocol\Smtp\Auth;
 
+use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use Zend\Mail\Protocol\Smtp\Auth\Crammd5;
 
@@ -16,7 +17,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Protocol\Smtp\Auth\Crammd5<extended>
  */
-class Crammd5Test extends \PHPUnit_Framework_TestCase
+class Crammd5Test extends TestCase
 {
     /**
      * @var Crammd5
diff --git a/test/Protocol/SmtpPluginManagerCompatibilityTest.php b/test/Protocol/SmtpPluginManagerCompatibilityTest.php
index 0943a566..f2be5d55 100644
--- a/test/Protocol/SmtpPluginManagerCompatibilityTest.php
+++ b/test/Protocol/SmtpPluginManagerCompatibilityTest.php
@@ -9,7 +9,7 @@
 
 namespace ZendTest\Mail\Protocol;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Protocol\Smtp;
 use Zend\Mail\Protocol\SmtpPluginManager;
 use Zend\Mail\Protocol\Exception\InvalidArgumentException;
diff --git a/test/Protocol/SmtpPluginManagerFactoryTest.php b/test/Protocol/SmtpPluginManagerFactoryTest.php
index 145bd52f..1f83ebc6 100644
--- a/test/Protocol/SmtpPluginManagerFactoryTest.php
+++ b/test/Protocol/SmtpPluginManagerFactoryTest.php
@@ -8,7 +8,7 @@
 namespace ZendTest\Mail\Protocol;
 
 use Interop\Container\ContainerInterface;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Protocol\Smtp;
 use Zend\Mail\Protocol\SmtpPluginManager;
 use Zend\Mail\Protocol\SmtpPluginManagerFactory;
diff --git a/test/Protocol/SmtpTest.php b/test/Protocol/SmtpTest.php
index 8962a7a1..393d2d71 100644
--- a/test/Protocol/SmtpTest.php
+++ b/test/Protocol/SmtpTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Protocol;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Headers;
 use Zend\Mail\Message;
 use Zend\Mail\Transport\Smtp;
@@ -18,7 +19,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Protocol\Smtp<extended>
  */
-class SmtpTest extends \PHPUnit_Framework_TestCase
+class SmtpTest extends TestCase
 {
     /** @var Smtp */
     public $transport;
@@ -107,7 +108,8 @@ public function testConnectHasVerboseErrors()
     {
         $smtp = new TestAsset\ErroneousSmtp();
 
-        $this->setExpectedExceptionRegExp('Zend\Mail\Protocol\Exception\RuntimeException', '/nonexistentremote/');
+        $this->expectException('Zend\Mail\Protocol\Exception\RuntimeException');
+        $this->expectExceptionMessageRegExp('/nonexistentremote/');
 
         $smtp->connect('nonexistentremote');
     }
diff --git a/test/Storage/ImapTest.php b/test/Storage/ImapTest.php
index 2b279086..d231997f 100644
--- a/test/Storage/ImapTest.php
+++ b/test/Storage/ImapTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Storage;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Config;
 use Zend\Mail\Protocol;
 use Zend\Mail\Storage;
@@ -16,7 +17,7 @@
 /**
  * @covers Zend\Mail\Storage\Imap<extended>
  */
-class ImapTest extends \PHPUnit_Framework_TestCase
+class ImapTest extends TestCase
 {
     protected $params;
 
@@ -98,13 +99,13 @@ public function testConnectConfig()
     public function testConnectFailure()
     {
         $this->params['host'] = 'example.example';
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Imap($this->params);
     }
 
     public function testNoParams()
     {
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Imap([]);
     }
 
@@ -132,14 +133,14 @@ public function testConnectTLS()
     public function testInvalidService()
     {
         $this->params['port'] = getenv('TESTS_ZEND_MAIL_IMAP_INVALID_PORT');
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Imap($this->params);
     }
 
     public function testWrongService()
     {
         $this->params['port'] = getenv('TESTS_ZEND_MAIL_IMAP_WRONG_PORT');
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Imap($this->params);
     }
 
@@ -147,7 +148,7 @@ public function testWrongUsername()
     {
         // this also triggers ...{chars}<NL>token for coverage
         $this->params['user'] = "there is no\nnobody";
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Imap($this->params);
     }
 
@@ -162,14 +163,14 @@ public function testWithInstanceConstruction()
     public function testWithNotConnectedInstance()
     {
         $protocol = new Protocol\Imap();
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Imap($protocol);
     }
 
     public function testWithNotLoggedInstance()
     {
         $protocol = new Protocol\Imap($this->params['host']);
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Imap($protocol);
     }
 
@@ -177,7 +178,7 @@ public function testWrongFolder()
     {
         $this->params['folder'] = 'this folder does not exist on your server';
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Imap($this->params);
     }
 
@@ -287,14 +288,14 @@ public function testTooLateCount()
         $mail->close();
         // after closing we can't count messages
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->countMessages();
     }
 
     public function testLoadUnkownFolder()
     {
         $this->params['folder'] = 'UnknownFolder';
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Imap($this->params);
     }
 
@@ -309,7 +310,7 @@ public function testChangeFolder()
     public function testUnknownFolder()
     {
         $mail = new Storage\Imap($this->params);
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->selectFolder('/Unknown/Folder/');
     }
 
@@ -435,7 +436,7 @@ public function testUniqueId()
     public function testWrongUniqueId()
     {
         $mail = new Storage\Imap($this->params);
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->getNumberByUniqueId('this_is_an_invalid_id');
     }
 
@@ -455,7 +456,7 @@ public function testCreateExistingFolder()
     {
         $mail = new Storage\Imap($this->params);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->createFolder('subfolder/test');
     }
 
@@ -464,7 +465,7 @@ public function testRemoveFolderName()
         $mail = new Storage\Imap($this->params);
         $mail->removeFolder('subfolder/test');
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->getFolders()->subfolder->test;
     }
 
@@ -473,7 +474,7 @@ public function testRemoveFolderInstance()
         $mail = new Storage\Imap($this->params);
         $mail->removeFolder($mail->getFolders()->subfolder->test);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->getFolders()->subfolder->test;
     }
 
@@ -481,7 +482,7 @@ public function testRemoveInvalidFolder()
     {
         $mail = new Storage\Imap($this->params);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->removeFolder('thisFolderDoestNotExist');
     }
 
@@ -492,7 +493,7 @@ public function testRenameFolder()
         $mail->renameFolder('subfolder/test', 'subfolder/test1');
         $mail->renameFolder($mail->getFolders()->subfolder->test1, 'subfolder/test');
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->renameFolder('subfolder/test', 'INBOX');
     }
 
@@ -512,7 +513,7 @@ public function testAppend()
         $this->assertEquals($count + 1, $mail->countMessages());
         $this->assertEquals($mail->getMessage($count + 1)->subject, 'append test');
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->appendMessage('');
     }
 
@@ -532,7 +533,7 @@ public function testCopy()
         $this->assertEquals($mail->getMessage($count + 1)->from, $message->from);
         $this->assertEquals($mail->getMessage($count + 1)->to, $message->to);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->copyMessage(1, 'justARandomFolder');
     }
 
@@ -561,7 +562,7 @@ public function testSetFlags()
         $this->assertFalse($message->hasFlag(Storage::FLAG_FLAGGED));
         $this->assertTrue($message->hasFlag('myflag'));
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->setFlags(1, [Storage::FLAG_RECENT]);
     }
 
@@ -610,7 +611,7 @@ public function testClosedSocketNewlineToken()
         $protocol->login($this->params['user'], $this->params['password']);
         $protocol->logout();
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $protocol->select("foo\nbar");
     }
 
@@ -645,7 +646,7 @@ public function testFetch()
             $this->assertInternalType('array', $v['FLAGS']);
         }
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $protocol->fetch('UID', 99);
     }
 
diff --git a/test/Storage/MaildirFolderTest.php b/test/Storage/MaildirFolderTest.php
index 8cba8bf5..b1850a9a 100644
--- a/test/Storage/MaildirFolderTest.php
+++ b/test/Storage/MaildirFolderTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Storage;
 
+use PHPUnit\Framework\TestCase;
 use RecursiveIteratorIterator;
 use Zend\Config;
 use Zend\Mail\Storage\Folder;
@@ -16,7 +17,7 @@
 /**
  * @group      Zend_Mail
  */
-class MaildirFolderTest extends \PHPUnit_Framework_TestCase
+class MaildirFolderTest extends TestCase
 {
     protected $params;
     protected $originalDir;
@@ -118,20 +119,20 @@ public function testLoadConfig()
 
     public function testNoParams()
     {
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Folder\Maildir([]);
     }
 
     public function testLoadFailure()
     {
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Folder\Maildir(['dirname' => 'This/Folder/Does/Not/Exist']);
     }
 
     public function testLoadUnkownFolder()
     {
         $this->params['folder'] = 'UnknownFolder';
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Folder\Maildir($this->params);
     }
 
@@ -149,7 +150,7 @@ public function testUnknownFolder()
     {
         $mail = new Folder\Maildir($this->params);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->selectFolder('/Unknown/Folder/');
     }
 
@@ -355,7 +356,7 @@ public function testGetInvalidFolder()
         $root = $mail->getFolders();
         $root->foobar = new Folder('foobar', DIRECTORY_SEPARATOR . 'foobar');
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->selectFolder('foobar');
     }
 
@@ -365,7 +366,7 @@ public function testGetVanishedFolder()
         $root = $mail->getFolders();
         $root->foobar = new Folder('foobar', 'foobar');
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->selectFolder('foobar');
     }
 
@@ -375,7 +376,7 @@ public function testGetNotSelectableFolder()
         $root = $mail->getFolders();
         $root->foobar = new Folder('foobar', 'foobar', false);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->selectFolder('foobar');
     }
 
diff --git a/test/Storage/MaildirMessageOldTest.php b/test/Storage/MaildirMessageOldTest.php
index 148e9514..125260bb 100644
--- a/test/Storage/MaildirMessageOldTest.php
+++ b/test/Storage/MaildirMessageOldTest.php
@@ -9,7 +9,7 @@
 
 namespace ZendTest\Mail\Storage;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Storage;
 
 class MaildirMessageOldTest extends TestCase
diff --git a/test/Storage/MaildirTest.php b/test/Storage/MaildirTest.php
index 025201da..5966de1a 100644
--- a/test/Storage/MaildirTest.php
+++ b/test/Storage/MaildirTest.php
@@ -9,13 +9,14 @@
 
 namespace ZendTest\Mail\Storage;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Config;
 use Zend\Mail\Storage;
 
 /**
  * @group      Zend_Mail
  */
-class MaildirTest extends \PHPUnit_Framework_TestCase
+class MaildirTest extends TestCase
 {
     protected $originalMaildir;
     protected $maildir;
@@ -98,13 +99,13 @@ public function testLoadConfig()
 
     public function testLoadFailure()
     {
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Maildir(['dirname' => '/This/Dir/Does/Not/Exist']);
     }
 
     public function testLoadInvalid()
     {
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Maildir(['dirname' => __DIR__]);
     }
 
@@ -200,7 +201,7 @@ public function testFetchWrongSize()
     {
         $mail = new Storage\Maildir(['dirname' => $this->maildir]);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->getSize(0);
     }
 
@@ -208,7 +209,7 @@ public function testFetchWrongMessageBody()
     {
         $mail = new Storage\Maildir(['dirname' => $this->maildir]);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->getMessage(0);
     }
 
@@ -216,7 +217,7 @@ public function testFailedRemove()
     {
         $mail = new Storage\Maildir(['dirname' => $this->maildir]);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->removeMessage(1);
     }
 
@@ -262,7 +263,7 @@ public function testWrongUniqueId()
     {
         $mail = new Storage\Maildir(['dirname' => $this->maildir]);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->getNumberByUniqueId('this_is_an_invalid_id');
     }
 
diff --git a/test/Storage/MaildirWritableTest.php b/test/Storage/MaildirWritableTest.php
index b26440ff..20396d93 100644
--- a/test/Storage/MaildirWritableTest.php
+++ b/test/Storage/MaildirWritableTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Storage;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail;
 use Zend\Mail\Storage;
 use Zend\Mail\Storage\Writable;
@@ -16,7 +17,7 @@
 /**
  * @group      Zend_Mail
  */
-class MaildirWritableTest extends \PHPUnit_Framework_TestCase
+class MaildirWritableTest extends TestCase
 {
     protected $params;
     protected $originalDir;
@@ -133,21 +134,21 @@ public function testCreateFolder()
     public function testCreateFolderEmptyPart()
     {
         $mail = new Writable\Maildir($this->params);
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->createFolder('foo..bar');
     }
 
     public function testCreateFolderSlash()
     {
         $mail = new Writable\Maildir($this->params);
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->createFolder('foo/bar');
     }
 
     public function testCreateFolderDirectorySeparator()
     {
         $mail = new Writable\Maildir($this->params);
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->createFolder('foo' . DIRECTORY_SEPARATOR . 'bar');
     }
 
@@ -157,7 +158,7 @@ public function testCreateFolderExistingDir()
         $mail = new Writable\Maildir($this->params);
         unset($mail->getFolders()->subfolder->test);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->createFolder('subfolder.test');
     }
 
@@ -165,7 +166,7 @@ public function testCreateExistingFolder()
     {
         $mail = new Writable\Maildir($this->params);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->createFolder('subfolder.test');
     }
 
@@ -175,7 +176,7 @@ public function testRemoveFolderName()
         $mail = new Writable\Maildir($this->params);
         $mail->removeFolder('INBOX.subfolder.test');
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->selectFolder($mail->getFolders()->subfolder->test);
     }
 
@@ -185,7 +186,7 @@ public function testRemoveFolderInstance()
         $mail = new Writable\Maildir($this->params);
         $mail->removeFolder($mail->getFolders()->subfolder->test);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->selectFolder($mail->getFolders()->subfolder->test);
     }
 
@@ -193,7 +194,7 @@ public function testRemoveFolderWithChildren()
     {
         $mail = new Writable\Maildir($this->params);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->removeFolder($mail->getFolders()->subfolder);
     }
 
@@ -203,7 +204,7 @@ public function testRemoveSelectedFolder()
         $mail = new Writable\Maildir($this->params);
         $mail->selectFolder('subfolder.test');
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->removeFolder('subfolder.test');
     }
 
@@ -211,7 +212,7 @@ public function testRemoveInvalidFolder()
     {
         $mail = new Writable\Maildir($this->params);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->removeFolder('thisFolderDoestNotExist');
     }
 
@@ -223,7 +224,7 @@ public function testRenameFolder()
         $mail->renameFolder('INBOX.subfolder', 'INBOX.foo');
         $mail->renameFolder($mail->getFolders()->foo, 'subfolder');
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->renameFolder('INBOX', 'foo');
     }
 
@@ -233,7 +234,7 @@ public function testRenameSelectedFolder()
         $mail = new Writable\Maildir($this->params);
         $mail->selectFolder('subfolder.test');
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->renameFolder('subfolder.test', 'foo');
     }
 
@@ -241,7 +242,7 @@ public function testRenameToChild()
     {
         $mail = new Writable\Maildir($this->params);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->renameFolder('subfolder.test', 'subfolder.test.foo');
     }
 
@@ -279,7 +280,7 @@ public function testCopy()
         $this->assertEquals($mail->getMessage($count + 1)->from, $message->from);
         $this->assertEquals($mail->getMessage($count + 1)->to, $message->to);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->copyMessage(1, 'justARandomFolder');
     }
 
@@ -302,7 +303,7 @@ public function testSetFlags()
         $this->assertFalse($message->hasFlag(Storage::FLAG_SEEN));
         $this->assertTrue($message->hasFlag(Storage::FLAG_FLAGGED));
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->setFlags(1, [Storage::FLAG_RECENT]);
     }
 
@@ -311,7 +312,7 @@ public function testSetFlagsRemovedFile()
         $mail = new Writable\Maildir($this->params);
         unlink($this->params['dirname'] . 'cur/1000000000.P1.example.org:2,S');
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
     }
 
     public function testRemove()
@@ -331,7 +332,7 @@ public function testRemoveRemovedFile()
         $mail = new Writable\Maildir($this->params);
         unlink($this->params['dirname'] . 'cur/1000000000.P1.example.org:2,S');
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->removeMessage(1);
     }
 
@@ -395,7 +396,7 @@ public function testMissingMaildirsize()
 
         $this->assertNull($mail->getQuota());
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->getQuota(true);
     }
 
@@ -447,7 +448,7 @@ public function testAppendMessage()
         $mail->setQuota(true);
         $this->assertTrue($mail->checkQuota());
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->appendMessage("Subject: test\r\n\r\n");
     }
 
diff --git a/test/Storage/MboxFolderTest.php b/test/Storage/MboxFolderTest.php
index 3a4532a7..1e7efad7 100644
--- a/test/Storage/MboxFolderTest.php
+++ b/test/Storage/MboxFolderTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Storage;
 
+use PHPUnit\Framework\TestCase;
 use RecursiveIteratorIterator;
 use Zend\Config;
 use Zend\Mail\Storage\Folder;
@@ -16,7 +17,7 @@
 /**
  * @group      Zend_Mail
  */
-class MboxFolderTest extends \PHPUnit_Framework_TestCase
+class MboxFolderTest extends TestCase
 {
     protected $params;
     protected $originalDir;
@@ -89,29 +90,31 @@ public function tearDown()
     public function testLoadOk()
     {
         new Folder\Mbox($this->params);
+        $this->addToAssertionCount(1);
     }
 
     public function testLoadConfig()
     {
         new Folder\Mbox(new Config\Config($this->params));
+        $this->addToAssertionCount(1);
     }
 
     public function testNoParams()
     {
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Folder\Mbox([]);
     }
 
     public function testFilenameParam()
     {
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         // filename is not allowed in this subclass
         new Folder\Mbox(['filename' => 'foobar']);
     }
 
     public function testLoadFailure()
     {
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Folder\Mbox(['dirname' => 'This/Folder/Does/Not/Exist']);
     }
 
@@ -119,7 +122,7 @@ public function testLoadUnkownFolder()
     {
         $this->params['folder'] = 'UnknownFolder';
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Folder\Mbox($this->params);
     }
 
@@ -138,14 +141,14 @@ public function testChangeFolder()
     public function testChangeFolderUnselectable()
     {
         $mail = new Folder\Mbox($this->params);
-        $this->setExpectedException('Zend\Mail\Storage\Exception\RuntimeException');
+        $this->expectException('Zend\Mail\Storage\Exception\RuntimeException');
         $mail->selectFolder(DIRECTORY_SEPARATOR . 'subfolder');
     }
 
     public function testUnknownFolder()
     {
         $mail = new Folder\Mbox($this->params);
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->selectFolder('/Unknown/Folder/');
     }
 
@@ -285,7 +288,7 @@ public function testNotMboxFile()
         touch($this->params['dirname'] . 'foobar');
         $mail = new Folder\Mbox($this->params);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->getFolders()->foobar;
     }
 
@@ -328,7 +331,7 @@ public function testGetInvalidFolder()
         $mail = new Folder\Mbox($this->params);
         $root = $mail->getFolders();
         $root->foobar = new Folder('x', 'x');
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->getFolders('foobar');
     }
 
@@ -338,7 +341,7 @@ public function testGetVanishedFolder()
         $root = $mail->getFolders();
         $root->foobar = new Folder('foobar', DIRECTORY_SEPARATOR . 'foobar');
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\RuntimeException');
+        $this->expectException('Zend\Mail\Storage\Exception\RuntimeException');
         $mail->selectFolder('foobar');
     }
 }
diff --git a/test/Storage/MboxInterfaceTest.php b/test/Storage/MboxInterfaceTest.php
index 0aa2a982..d6549d34 100644
--- a/test/Storage/MboxInterfaceTest.php
+++ b/test/Storage/MboxInterfaceTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Storage;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail;
 use Zend\Mail\Storage;
 use Zend\Mail\Storage\Message;
@@ -17,7 +18,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Storage\Mbox<extended>
  */
-class MboxInterfaceTest extends \PHPUnit_Framework_TestCase
+class MboxInterfaceTest extends TestCase
 {
     protected $mboxFile;
 
@@ -60,7 +61,7 @@ public function testArraySetFail()
     {
         $list = new Storage\Mbox(['filename' => $this->mboxFile]);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\RuntimeException');
+        $this->expectException('Zend\Mail\Storage\Exception\RuntimeException');
         $list[1] = 'test';
     }
 
@@ -136,7 +137,7 @@ public function testWrongVariable()
     {
         $list = new Storage\Mbox(['filename' => $this->mboxFile]);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $list->thisdoesnotexist;
     }
 
@@ -151,7 +152,7 @@ public function testWrongHeader()
     {
         $list = new Storage\Mbox(['filename' => $this->mboxFile]);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $list[1]->thisdoesnotexist;
     }
 }
diff --git a/test/Storage/MboxMessageOldTest.php b/test/Storage/MboxMessageOldTest.php
index 5485d3cd..26b8f72b 100644
--- a/test/Storage/MboxMessageOldTest.php
+++ b/test/Storage/MboxMessageOldTest.php
@@ -9,7 +9,7 @@
 
 namespace ZendTest\Mail\Storage;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 class MboxMessageOldTest extends TestCase
 {
diff --git a/test/Storage/MboxTest.php b/test/Storage/MboxTest.php
index 4a55ddb4..75bea0b0 100644
--- a/test/Storage/MboxTest.php
+++ b/test/Storage/MboxTest.php
@@ -9,13 +9,14 @@
 
 namespace ZendTest\Mail\Storage;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Config;
 use Zend\Mail\Storage;
 
 /**
  * @group      Zend_Mail
  */
-class MboxTest extends \PHPUnit_Framework_TestCase
+class MboxTest extends TestCase
 {
     protected $mboxOriginalFile;
     protected $mboxFile;
@@ -63,28 +64,30 @@ public function tearDown()
     public function testLoadOk()
     {
         new Storage\Mbox(['filename' => $this->mboxFile]);
+        $this->addToAssertionCount(1);
     }
 
     public function testLoadConfig()
     {
         new Storage\Mbox(new Config\Config(['filename' => $this->mboxFile]));
+        $this->addToAssertionCount(1);
     }
 
     public function testNoParams()
     {
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Mbox([]);
     }
 
     public function testLoadFailure()
     {
-        $this->setExpectedException('Zend\Mail\Storage\Exception\RuntimeException');
+        $this->expectException('Zend\Mail\Storage\Exception\RuntimeException');
         new Storage\Mbox(['filename' => 'ThisFileDoesNotExist']);
     }
 
     public function testLoadInvalid()
     {
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Mbox(['filename' => __FILE__]);
     }
 
@@ -93,6 +96,7 @@ public function testClose()
         $mail = new Storage\Mbox(['filename' => $this->mboxFile]);
 
         $mail->close();
+        $this->addToAssertionCount(1);
     }
 
     public function testHasTop()
@@ -113,7 +117,7 @@ public function testNoop()
     {
         $mail = new Storage\Mbox(['filename' => $this->mboxFile]);
 
-        $mail->noop();
+        $this->assertTrue($mail->noop());
     }
 
     public function testCount()
@@ -204,7 +208,7 @@ public function testFailedRemove()
     {
         $mail = new Storage\Mbox(['filename' => $this->mboxFile]);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\RuntimeException');
+        $this->expectException('Zend\Mail\Storage\Exception\RuntimeException');
         $mail->removeMessage(1);
     }
 
@@ -229,7 +233,7 @@ public function testOutOfBounds()
     {
         $mail = new Storage\Mbox(['filename' => $this->mboxFile]);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\OutOfBoundsException');
+        $this->expectException('Zend\Mail\Storage\Exception\OutOfBoundsException');
         $mail->seek(INF);
     }
 
diff --git a/test/Storage/MessageTest.php b/test/Storage/MessageTest.php
index 6c731fe8..7ce380bc 100644
--- a/test/Storage/MessageTest.php
+++ b/test/Storage/MessageTest.php
@@ -9,6 +9,8 @@
 
 namespace ZendTest\Mail\Storage;
 
+use Exception as GeneralException;
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Exception as MailException;
 use Zend\Mail\Storage;
 use Zend\Mail\Storage\Exception;
@@ -20,7 +22,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Storage\Message<extended>
  */
-class MessageTest extends \PHPUnit_Framework_TestCase
+class MessageTest extends TestCase
 {
     protected $file;
     protected $file2;
@@ -33,13 +35,8 @@ public function setUp()
 
     public function testInvalidFile()
     {
-        try {
-            $message = new Message(['file' => '/this/file/does/not/exists']);
-        } catch (\Exception $e) {
-            return; // ok
-        }
-
-        $this->fail('no exception raised while loading unknown file');
+        $this->expectException(GeneralException::class);
+        new Message(['file' => '/this/file/does/not/exists']);
     }
 
     /**
@@ -96,15 +93,9 @@ public function testGetFirstPartTwice()
 
     public function testGetWrongPart()
     {
+        $this->expectException(GeneralException::class);
         $message = new Message(['file' => $this->file]);
-
-        try {
-            $message->getPart(-1);
-        } catch (\Exception $e) {
-            return; // ok
-        }
-
-        $this->fail('no exception raised while fetching unknown part');
+        $message->getPart(-1);
     }
 
     public function testNoHeaderMessage()
@@ -154,37 +145,21 @@ public function testSplitEmptyMessage()
 
     public function testSplitInvalidMessage()
     {
-        try {
-            Mime\Decode::splitMessageStruct("--xxx\n", 'xxx');
-        } catch (MimeException\ExceptionInterface $e) {
-            return; // ok
-        }
-
-        $this->fail('no exception raised while decoding invalid message');
+        $this->expectException(MimeException\ExceptionInterface::class);
+        Mime\Decode::splitMessageStruct("--xxx\n", 'xxx');
     }
 
     public function testInvalidMailHandler()
     {
-        try {
-            $message = new Message(['handler' => 1]);
-        } catch (Exception\InvalidArgumentException $e) {
-            return; // ok
-        }
-
-        $this->fail('no exception raised while using invalid mail handler');
+        $this->expectException(Exception\InvalidArgumentException::class);
+        new Message(['handler' => 1]);
     }
 
     public function testMissingId()
     {
+        $this->expectException(Exception\InvalidArgumentException::class);
         $mail = new Storage\Mbox(['filename' => __DIR__ . '/../_files/test.mbox/INBOX']);
-
-        try {
-            $message = new Message(['handler' => $mail]);
-        } catch (Exception\InvalidArgumentException $e) {
-            return; // ok
-        }
-
-        $this->fail('no exception raised while mail handler without id');
+        new Message(['handler' => $mail]);
     }
 
     public function testIterator()
@@ -217,14 +192,9 @@ public function testSplitHeader()
 
     public function testSplitInvalidHeader()
     {
+        $this->expectException(MimeException\ExceptionInterface::class);
         $header = '';
-        try {
-            Mime\Decode::splitHeaderField($header);
-        } catch (MimeException\ExceptionInterface $e) {
-            return; // ok
-        }
-
-        $this->fail('no exception raised while decoding invalid header field');
+        Mime\Decode::splitHeaderField($header);
     }
 
     public function testSplitMessage()
@@ -254,15 +224,9 @@ public function testToplines()
 
     public function testNoContent()
     {
+        $this->expectException(Exception\RuntimeException::class);
         $message = new Message(['raw' => 'Subject: test']);
-
-        try {
-            $message->getContent();
-        } catch (Exception\RuntimeException $e) {
-            return; // ok
-        }
-
-        $this->fail('no exception raised while getting content of message without body');
+        $message->getContent();
     }
 
     public function testEmptyHeader()
@@ -273,7 +237,7 @@ public function testEmptyHeader()
         $message = new Message([]);
         $subject = null;
 
-        $this->setExpectedException('Zend\\Mail\\Exception\\InvalidArgumentException');
+        $this->expectException('Zend\\Mail\\Exception\\InvalidArgumentException');
         $message->subject;
     }
 
@@ -310,14 +274,9 @@ public function testCheckingHasHeaderFunctionality()
 
     public function testWrongMultipart()
     {
+        $this->expectException(Exception\RuntimeException::class);
         $message = new Message(['raw' => "Content-Type: multipart/mixed\r\n\r\ncontent"]);
-
-        try {
-            $message->getPart(1);
-        } catch (Exception\RuntimeException $e) {
-            return; // ok
-        }
-        $this->fail('no exception raised while getting part from message without boundary');
+        $message->getPart(1);
     }
 
     public function testLateFetch()
@@ -397,13 +356,9 @@ public function testGetHeaderFieldMissing()
 
     public function testGetHeaderFieldInvalid()
     {
+        $this->expectException(MailException\ExceptionInterface::class);
         $message = new Message(['file' => $this->file]);
-        try {
-            $message->getHeaderField('fake-header-name', 'foo');
-        } catch (MailException\ExceptionInterface $e) {
-            return;
-        }
-        $this->fail('No exception thrown while requesting invalid field name');
+        $message->getHeaderField('fake-header-name', 'foo');
     }
 
     public function testCaseInsensitiveMultipart()
@@ -431,7 +386,7 @@ public function testSpaceInFieldName()
      */
     public function testStrictParseMessage()
     {
-        $this->setExpectedException('Zend\\Mail\\Exception\\RuntimeException');
+        $this->expectException('Zend\\Mail\\Exception\\RuntimeException');
 
         $raw = file_get_contents($this->file);
         $raw = "From foo@example.com  Sun Jan 01 00:00:00 2000\n" . $raw;
diff --git a/test/Storage/Pop3Test.php b/test/Storage/Pop3Test.php
index badf7f53..6a61c394 100644
--- a/test/Storage/Pop3Test.php
+++ b/test/Storage/Pop3Test.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Storage;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Config;
 use Zend\Mail\Protocol;
 use Zend\Mail\Storage;
@@ -17,7 +18,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Storage\Pop3<extended>
  */
-class Pop3Test extends \PHPUnit_Framework_TestCase
+class Pop3Test extends TestCase
 {
     protected $params;
 
@@ -105,13 +106,13 @@ public function testConnectFailure()
     {
         $this->params['host'] = 'example.example';
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Pop3($this->params);
     }
 
     public function testNoParams()
     {
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Pop3([]);
     }
 
@@ -141,7 +142,7 @@ public function testInvalidService()
     {
         $this->params['port'] = getenv('TESTS_ZEND_MAIL_POP3_INVALID_PORT');
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Pop3($this->params);
     }
 
@@ -149,7 +150,7 @@ public function testWrongService()
     {
         $this->params['port'] = getenv('TESTS_ZEND_MAIL_POP3_WRONG_PORT');
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         new Storage\Pop3($this->params);
     }
 
@@ -262,7 +263,7 @@ public function testWithInstanceConstruction()
         $protocol = new Protocol\Pop3($this->params['host']);
         $mail = new Storage\Pop3($protocol);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         // because we did no login this has to throw an exception
         $mail->getMessage(1);
     }
@@ -272,7 +273,7 @@ public function testRequestAfterClose()
         $mail = new Storage\Pop3($this->params);
         $mail->close();
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->getMessage(1);
     }
 
@@ -328,7 +329,7 @@ public function testWrongUniqueId()
     {
         $mail = new Storage\Pop3($this->params);
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $mail->getNumberByUniqueId('this_is_an_invalid_id');
     }
 
@@ -337,7 +338,7 @@ public function testReadAfterClose()
         $protocol = new Protocol\Pop3($this->params['host']);
         $protocol->logout();
 
-        $this->setExpectedException('Zend\Mail\Storage\Exception\InvalidArgumentException');
+        $this->expectException('Zend\Mail\Storage\Exception\InvalidArgumentException');
         $protocol->readResponse();
     }
 
diff --git a/test/Transport/FactoryTest.php b/test/Transport/FactoryTest.php
index b15218d1..a605e163 100644
--- a/test/Transport/FactoryTest.php
+++ b/test/Transport/FactoryTest.php
@@ -7,14 +7,14 @@
 
 namespace ZendTest\Mail\Transport;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Transport\Factory;
 use Zend\Stdlib\ArrayObject;
 
 /**
  * @covers Zend\Mail\Transport\Factory<extended>
  */
-class FactoryTest extends PHPUnit_Framework_TestCase
+class FactoryTest extends TestCase
 {
     /**
      * @dataProvider invalidSpecTypeProvider
diff --git a/test/Transport/FileOptionsTest.php b/test/Transport/FileOptionsTest.php
index 05369766..2a5a3c23 100644
--- a/test/Transport/FileOptionsTest.php
+++ b/test/Transport/FileOptionsTest.php
@@ -9,13 +9,14 @@
 
 namespace ZendTest\Mail\Transport;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Transport\FileOptions;
 
 /**
  * @group      Zend_Mail
  * @covers Zend\Mail\Transport\FileOptions<extended>
  */
-class FileOptionsTest extends \PHPUnit_Framework_TestCase
+class FileOptionsTest extends TestCase
 {
     public function setUp()
     {
diff --git a/test/Transport/FileTest.php b/test/Transport/FileTest.php
index 722bcdb1..ce9ada54 100644
--- a/test/Transport/FileTest.php
+++ b/test/Transport/FileTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Transport;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Message;
 use Zend\Mail\Transport\File;
 use Zend\Mail\Transport\FileOptions;
@@ -17,7 +18,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Transport\File<extended>
  */
-class FileTest extends \PHPUnit_Framework_TestCase
+class FileTest extends TestCase
 {
     public function setUp()
     {
diff --git a/test/Transport/InMemoryTest.php b/test/Transport/InMemoryTest.php
index 4a7637a2..08d2dd88 100644
--- a/test/Transport/InMemoryTest.php
+++ b/test/Transport/InMemoryTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Transport;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Message;
 use Zend\Mail\Transport\InMemory;
 
@@ -16,7 +17,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Transport\InMemory<extended>
  */
-class InMemoryTest extends \PHPUnit_Framework_TestCase
+class InMemoryTest extends TestCase
 {
     public function getMessage()
     {
diff --git a/test/Transport/NullTest.php b/test/Transport/NullTest.php
index f2b92746..f563a448 100644
--- a/test/Transport/NullTest.php
+++ b/test/Transport/NullTest.php
@@ -9,12 +9,13 @@
 
 namespace ZendTest\Mail\Transport;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Transport\Null as NullTransport;
 
 /**
  * @group      Zend_Mail
  */
-class NullTest extends \PHPUnit_Framework_TestCase
+class NullTest extends TestCase
 {
     public function setUp()
     {
@@ -25,7 +26,7 @@ public function setUp()
 
     public function testRaisesNoticeOnInstantiation()
     {
-        $this->setExpectedException('PHPUnit_Framework_Error_Deprecated');
+        $this->expectException('PHPUnit_Framework_Error_Deprecated');
         new NullTransport();
     }
 }
diff --git a/test/Transport/SendmailTest.php b/test/Transport/SendmailTest.php
index c1ad5518..c51fa2a6 100644
--- a/test/Transport/SendmailTest.php
+++ b/test/Transport/SendmailTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Transport;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Message;
 use Zend\Mail\Transport\Exception\RuntimeException;
 use Zend\Mail\Transport\Sendmail;
@@ -17,7 +18,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Transport\Sendmail<extended>
  */
-class SendmailTest extends \PHPUnit_Framework_TestCase
+class SendmailTest extends TestCase
 {
     public $transport;
     public $to;
@@ -137,13 +138,13 @@ public function testAssertSubjectEncoded()
 
     public function testCodeInjectionInFromHeader()
     {
+        $this->expectException(RuntimeException::class);
         $message = $this->getMessage();
         $message->setBody('This is the text of the email.');
         $message->setFrom('"AAA\" code injection"@domain', 'Sender\'s name');
         $message->addTo('hacker@localhost', 'Name of recipient');
         $message->setSubject('TestSubject');
 
-        $this->setExpectedException(RuntimeException::class);
         $this->transport->send($message);
     }
 
diff --git a/test/Transport/SmtpTest.php b/test/Transport/SmtpTest.php
index 7978057e..51a92750 100644
--- a/test/Transport/SmtpTest.php
+++ b/test/Transport/SmtpTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\Mail\Transport;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Mail\Headers;
 use Zend\Mail\Message;
 use Zend\Mail\Transport\Smtp;
@@ -20,7 +21,7 @@
  * @group      Zend_Mail
  * @covers Zend\Mail\Transport\Smtp<extended>
  */
-class SmtpTest extends \PHPUnit_Framework_TestCase
+class SmtpTest extends TestCase
 {
     /** @var Smtp */
     public $transport;
@@ -60,8 +61,8 @@ public function getMessage()
      */
     public function testSendMailWithoutMinimalHeaders()
     {
-        $this->setExpectedException(
-            'Zend\Mail\Transport\Exception\RuntimeException',
+        $this->expectException('Zend\Mail\Transport\Exception\RuntimeException');
+        $this->expectExceptionMessage(
             'transport expects either a Sender or at least one From address in the Message; none provided'
         );
         $message = new Message();
@@ -74,10 +75,8 @@ public function testSendMailWithoutMinimalHeaders()
      */
     public function testSendMailWithoutRecipient()
     {
-        $this->setExpectedException(
-            'Zend\Mail\Transport\Exception\RuntimeException',
-            'at least one recipient if the message has at least one header or body'
-        );
+        $this->expectException('Zend\Mail\Transport\Exception\RuntimeException');
+        $this->expectExceptionMessage('at least one recipient if the message has at least one header or body');
         $message = new Message();
         $message->setSender('ralph.schindler@zend.com', 'Ralph Schindler');
         $this->transport->send($message);