diff --git a/.gitignore b/.gitignore
index f31187e..d92a4ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/coverage/
-/composer.lock
-/vendor/
-/.idea/
+build
+composer.lock
+phpunit.xml
+vendor
diff --git a/composer.json b/composer.json
index 8500f2a..62cb8ce 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
     "prefer-stable": true,
     "require-dev": {
         "amphp/loop": "dev-master",
-        "phpunit/phpunit": "^4.8",
+        "phpunit/phpunit": "^5.0",
         "fabpot/php-cs-fixer": "^1.9"
     },
     "autoload": {
diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index 744a96f..0000000
--- a/phpunit.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./test/bootstrap.php" colors="true">
-    <testsuites>
-        <testsuite name="Tests">
-            <directory>./test</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory>./lib</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..65f10fb
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+        backupGlobals="false"
+        backupStaticAttributes="false"
+        bootstrap="vendor/autoload.php"
+        colors="true"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        processIsolation="false"
+        stopOnFailure="false"
+>
+    <testsuites>
+        <testsuite name="Amp DNS">
+            <directory>test</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">lib</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-html" target="build/coverage" title="Amp" highlight="true"/>
+    </logging>
+</phpunit>
\ No newline at end of file
diff --git a/test/bootstrap.php b/test/bootstrap.php
deleted file mode 100644
index ecfd87b..0000000
--- a/test/bootstrap.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-error_reporting(E_ALL);
-
-require __DIR__.'/../vendor/autoload.php';
-
-if (ini_get("opcache.enable") == true &&
-    ini_get("opcache.save_comments") == false) {
-    echo "Cannot run tests. OPCache is enabled and is stripping comments, which are required by PHPUnit to provide data for the tests.\n";
-    exit(-1);
-}