diff --git a/.travis.yml b/.travis.yml
index f824806..160c926 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,19 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
   - hhvm
-  - 7
 
 before_script:
-  - composer self-update
-  - composer install --prefer-source
+  - composer install --no-interaction --prefer-source
+  - composer require --dev phpunit/phpunit
 
-script: phpunit --coverage-text
+script:
+  - ./vendor/bin/phpunit --coverage-text
+
+matrix:
+  allow_failures:
+    - php: hhvm
+  fast_finish: true
diff --git a/composer.json b/composer.json
index 4552d57..a613b5f 100644
--- a/composer.json
+++ b/composer.json
@@ -11,16 +11,13 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "symfony/http-foundation": "~2.1|~3.0",
-        "symfony/http-kernel": "~2.1|~3.0"
+        "symfony/http-foundation": "~2.1|~3.0|~4.0",
+        "symfony/http-kernel": "~2.1|~3.0|~4.0"
     },
     "autoload": {
         "psr-0": { "Stack": "src" }
     },
     "extra": {
         "branch-alias": { "dev-master": "1.0-dev" }
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^5.2"
     }
 }
diff --git a/tests/functional/BasicTest.php b/tests/functional/BasicTest.php
index 11afe1e..66673b4 100644
--- a/tests/functional/BasicTest.php
+++ b/tests/functional/BasicTest.php
@@ -6,7 +6,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-class BasicTest extends \PHPUnit_Framework_TestCase
+class BasicTest extends \PHPUnit\Framework\TestCase
 {
     /** @dataProvider provideRequests */
     public function testHelloWorld(Request $request)
diff --git a/tests/unit/Stack/CallableHttpKernelTest.php b/tests/unit/Stack/CallableHttpKernelTest.php
index 503afa9..ca54e2f 100644
--- a/tests/unit/Stack/CallableHttpKernelTest.php
+++ b/tests/unit/Stack/CallableHttpKernelTest.php
@@ -6,7 +6,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
-class CallableHttpKernelTest extends \PHPUnit_Framework_TestCase
+class CallableHttpKernelTest extends \PHPUnit\Framework\TestCase
 {
     /** @test */
     public function handleShouldDelegateToCallable()