diff --git a/composer.json b/composer.json
index 4c95a2f..bf041a6 100644
--- a/composer.json
+++ b/composer.json
@@ -31,9 +31,10 @@
     },
     "minimum-stability": "dev",
     "require-dev": {
+        "amphp/phpunit-util": "dev-master",
         "amphp/parallel": "dev-master as 0.1",
-        "phpunit/phpunit": "^5.0",
-        "friendsofphp/php-cs-fixer": "~1.9"
+        "phpunit/phpunit": "^6.0",
+        "friendsofphp/php-cs-fixer": "^2.3"
     },
     "suggest": {
         "amphp/parallel": "Provides async file access without the eio or uv extension."
diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index 15defc4..0000000
--- a/phpunit.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="./vendor/autoload.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..69095b7
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,31 @@
+<?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 Filesystem">
+            <directory>test</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">lib</directory>
+        </whitelist>
+    </filter>
+    <listeners>
+        <listener class="Amp\PHPUnit\LoopReset"/>
+    </listeners>
+    <logging>
+        <log type="coverage-html" target="build/coverage" title="Amp" highlight="true"/>
+    </logging>
+</phpunit>
diff --git a/test/DriverTest.php b/test/DriverTest.php
index 6171c03..aab0dec 100644
--- a/test/DriverTest.php
+++ b/test/DriverTest.php
@@ -3,8 +3,9 @@
 namespace Amp\File\Test;
 
 use Amp\File as file;
+use Amp\PHPUnit\TestCase;
 
-abstract class DriverTest extends \PHPUnit_Framework_TestCase {
+abstract class DriverTest extends TestCase {
     private static $fixtureId;
     private static $umask;
 
diff --git a/test/HandleTest.php b/test/HandleTest.php
index ec4465c..517c5b8 100644
--- a/test/HandleTest.php
+++ b/test/HandleTest.php
@@ -3,8 +3,9 @@
 namespace Amp\File\Test;
 
 use Amp\File as file;
+use Amp\PHPUnit\TestCase;
 
-abstract class HandleTest extends \PHPUnit_Framework_TestCase {
+abstract class HandleTest extends TestCase {
     public static function setUpBeforeClass() {
         Fixture::init();
     }