diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23835e2..2242647 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log
 
 
+## UNRELEASED
+
+### Changed
+
+- Make the test suite PHPUnit 6 compatible
+
+
 ## 0.5.1 - 2016-07-18
 
 ### Fixed
diff --git a/src/FeatureTestListener.php b/src/FeatureTestListener.php
index ab26c1a..18c5dd1 100644
--- a/src/FeatureTestListener.php
+++ b/src/FeatureTestListener.php
@@ -2,13 +2,16 @@
 
 namespace Http\Client\Tests;
 
-class FeatureTestListener extends \PHPUnit_TextUI_ResultPrinter
+use PHPUnit\Framework\Test;
+use PHPUnit\TextUI\ResultPrinter;
+
+class FeatureTestListener extends ResultPrinter
 {
     public function write($buffer)
     {
     }
 
-    public function startTest(\PHPUnit_Framework_Test $test)
+    public function startTest(Test $test)
     {
         $feature = $this->extractFeature($test);
 
@@ -21,7 +24,7 @@ public function startTest(\PHPUnit_Framework_Test $test)
         echo sprintf('%-40.s : ', $feature);
     }
 
-    public function endTest(\PHPUnit_Framework_Test $test, $time)
+    public function endTest(Test $test, $time)
     {
         if (!$this->lastTestFailed) {
             echo $this->formatWithColor('fg-green', 'Supported')."\n";
@@ -32,7 +35,7 @@ public function endTest(\PHPUnit_Framework_Test $test, $time)
         $this->lastTestFailed = false;
     }
 
-    private function extractFeature(\PHPUnit_Framework_Test $test)
+    private function extractFeature(Test $test)
     {
         $class = get_class($test);
         $method = $test->getName();