diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..0925d33
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/examples/ export-ignore
+/phpunit.xml.dist export-ignore
+/tests/ export-ignore
diff --git a/.travis.yml b/.travis.yml
index 6ad1916..0a5430e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,23 @@
 language: php
 
-php:
-# - 5.3 # requires old distro, see below
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7
-  - 7.1
-  - 7.2
-  - hhvm # ignore errors, see below
-
-# lock distro so future defaults will not break the build
+# lock distro so new future defaults will not break the build
 dist: trusty
 
 matrix:
   include:
     - php: 5.3
       dist: precise
+    - php: 5.4
+    - php: 5.5
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+    - php: 7.3
+    - php: 7.4
+    - php: hhvm-3.18
   allow_failures:
-    - php: hhvm
+    - php: hhvm-3.18
 
 sudo: false
 
diff --git a/composer.json b/composer.json
index 63a9c6d..d728c44 100644
--- a/composer.json
+++ b/composer.json
@@ -13,12 +13,15 @@
     "autoload": {
         "psr-4": { "Clue\\React\\Term\\": "src/" }
     },
+    "autoload-dev": {
+        "psr-4": { "Clue\\Tests\\React\\Term\\": "tests/" }
+    },
     "require": {
         "php": ">=5.3",
         "react/stream": "^1.0 || ^0.7"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0 || ^4.8",
+        "phpunit/phpunit": "^9.0 || ^5.0 || ^4.8",
         "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 55088da..d0bb55e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php"
-         colors="true"
->
+<phpunit bootstrap="vendor/autoload.php" colors="true">
     <testsuites>
-        <testsuite>
+        <testsuite name="Term Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
diff --git a/tests/ControlCodeParserTest.php b/tests/ControlCodeParserTest.php
index 1c6a3e0..c94399e 100644
--- a/tests/ControlCodeParserTest.php
+++ b/tests/ControlCodeParserTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Term;
+
 use Clue\React\Term\ControlCodeParser;
 use React\Stream\ThroughStream;
 
@@ -8,7 +10,10 @@ class ControlCodeParserTest extends TestCase
     private $input;
     private $parser;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpParser()
     {
         $this->input = new ThroughStream();
         $this->parser = new ControlCodeParser($this->input);
diff --git a/tests/FunctionalControlCodeParserTest.php b/tests/FunctionalControlCodeParserTest.php
index f411d44..666f509 100644
--- a/tests/FunctionalControlCodeParserTest.php
+++ b/tests/FunctionalControlCodeParserTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\React\Term;
+
 use Clue\React\Term\ControlCodeParser;
 use React\EventLoop\Factory;
 use React\Stream\ReadableResourceStream;
diff --git a/tests/bootstrap.php b/tests/TestCase.php
similarity index 82%
rename from tests/bootstrap.php
rename to tests/TestCase.php
index 91ad7d3..22be7e6 100644
--- a/tests/bootstrap.php
+++ b/tests/TestCase.php
@@ -1,10 +1,8 @@
 <?php
 
-require_once __DIR__ . '/../vendor/autoload.php';
+namespace Clue\Tests\React\Term;
 
-error_reporting(-1);
-
-class TestCase extends PHPUnit_Framework_TestCase
+class TestCase extends \PHPUnit\Framework\TestCase
 {
     protected function expectCallableNever()
     {
@@ -53,14 +51,6 @@ protected function expectCallableOnceParameter($type)
      */
     protected function createCallableMock()
     {
-        return $this->getMockBuilder('CallableStub')->getMock();
+        return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
     }
 }
-
-class CallableStub
-{
-    public function __invoke()
-    {
-    }
-}
-