diff --git a/composer.json b/composer.json
index 44f6b50..b74341f 100644
--- a/composer.json
+++ b/composer.json
@@ -3,10 +3,10 @@
     "description": "Allows mocking otherwise untestable PHP functions through the use of namespaces",
     "license": "MIT",
     "require": {
-        "php": "~7"
+        "php": "~7.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "~6"
+        "phpunit/phpunit": "~7"
     },
     "authors": [
         {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 435a1a3..0eebfb0 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -3,9 +3,7 @@
          convertErrorsToExceptions="true"
          convertWarningsToExceptions="true"
          convertNoticesToExceptions="true"
-         mapTestClassNameToCoveredClassName="true"
          bootstrap="vendor/autoload.php"
-         strict="true"
          verbose="true"
          colors="true">
 
@@ -16,18 +14,14 @@
     </testsuites>
 
     <logging>
-        <log type="coverage-html" target="build/coverage" title="ExceptionBundle"
-             charset="UTF-8" yui="true" highlight="true"
-             lowUpperBound="35" highLowerBound="70"/>
+        <log type="coverage-html" target="build/coverage" lowUpperBound="35" highLowerBound="70"/>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
+        <log type="junit" target="build/logs/junit.xml"/>
     </logging>
 
     <filter>
-        <blacklist>
-            <directory suffix=".php">tests/</directory>
-            <directory suffix=".php">vendor/</directory>
-            <directory suffix=".php">/usr/share/php</directory>
-        </blacklist>
+        <whitelist>
+            <directory suffix=".php">src/</directory>
+        </whitelist>
     </filter>
 </phpunit>
diff --git a/tests/PHPUnitTests/Extension/FunctionMockerTest.php b/tests/PHPUnitTests/Extension/FunctionMockerTest.php
index f68bf5d..e9c8160 100644
--- a/tests/PHPUnitTests/Extension/FunctionMockerTest.php
+++ b/tests/PHPUnitTests/Extension/FunctionMockerTest.php
@@ -11,12 +11,12 @@ class FunctionMockerTest extends TestCase
     /** @var FunctionMocker */
     private $functionMocker;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->functionMocker = FunctionMocker::start($this, 'My\TestNamespace');
     }
 
-    public function tearDown()
+    protected function tearDown(): void
     {
         FunctionMocker::tearDown();
     }
diff --git a/tests/PHPUnitTests/Extension/IntegrationTest.php b/tests/PHPUnitTests/Extension/IntegrationTest.php
index 7c9611b..ba9c97d 100644
--- a/tests/PHPUnitTests/Extension/IntegrationTest.php
+++ b/tests/PHPUnitTests/Extension/IntegrationTest.php
@@ -10,7 +10,7 @@ class IntegrationTest extends TestCase
 {
     private $php;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->php = FunctionMocker::start($this, 'PHPUnitTests\Extension\Fixtures')
             ->mockFunction('strpos')