diff --git a/.travis.yml b/.travis.yml
index b5525d9..415750a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,6 @@ services:
 env:
   - COMPOSER_FLAGS="--prefer-stable"
 
-php:
-  - hhvm
-
 matrix:
   include:
     # highest and lowest php with minimal dependencies
@@ -33,6 +30,10 @@ matrix:
     - php: 7.0
       env: SYMFONY_VERSION="3.1.*"
 
+    # run with Symfony 4.0
+    - php: 7.1
+      env: SYMFONY_VERSION="4.0.*"
+
 before_install: if [[ "$SYMFONY_VERSION" != "" ]]; then composer require --no-update symfony/symfony:${SYMFONY_VERSION}; fi
 
 install: composer update $COMPOSER_FLAGS --prefer-dist
diff --git a/composer.json b/composer.json
index f63121c..0f7ffe5 100644
--- a/composer.json
+++ b/composer.json
@@ -15,26 +15,25 @@
 
   "require": {
     "php"                          : "^5.5||^7.0",
-    "symfony/config"               : "^2.7||^3.0",
-    "symfony/dependency-injection" : "^2.7||^3.0",
-    "symfony/framework-bundle"     : "^2.7||^3.0",
-    "symfony/http-kernel"          : "^2.7||^3.0",
-    "symfony/property-access"      : "^2.7||^3.0",
-    "symfony/routing"              : "^2.7||^3.0"
+    "symfony/config"               : "^2.7||^3.0||^4.0",
+    "symfony/dependency-injection" : "^2.7||^3.0||^4.0",
+    "symfony/framework-bundle"     : "^2.7||^3.0||^4.0",
+    "symfony/http-kernel"          : "^2.7||^3.0||^4.0",
+    "symfony/property-access"      : "^2.7||^3.0||^4.0",
+    "symfony/routing"              : "^2.7||^3.0||^4.0"
   },
 
   "require-dev" : {
-    "symfony/finder"           : "^2.7||^3.0",
+    "symfony/finder"           : "^2.7||^3.0||^4.0",
     "doctrine/doctrine-bundle" : "^1.5.0",
     "doctrine/orm"             : "^2.5",
     "phpunit/phpunit"          : "^4.7||^5.0",
-    "symfony/phpunit-bridge"   : "^2.8||^3.0",
-    "symfony/security-http"    : "^2.7||^3.0",
-    "symfony/var-dumper"       : "^2.7"
+    "symfony/phpunit-bridge"   : "^2.8||^3.0||^4.0",
+    "symfony/security-http"    : "^2.7||^3.0||^4.0",
+    "symfony/var-dumper"       : "^2.7||^3.0||^4.0"
   },
 
   "minimum-stability" : "dev",
-  "prefer-stable"     : true,
 
   "autoload": {
     "psr-4": {
@@ -45,7 +44,10 @@
   "autoload-dev": {
     "psr-4": {
       "Iltar\\HttpBundle\\" : "test/"
-    }
+    },
+    "classmap": [
+      "test/Functional/Fixtures/TestKernel.php"
+    ]
   },
 
   "archive": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 6ab17e9..51e36a6 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -6,6 +6,7 @@
     bootstrap                     = "vendor/autoload.php"
 >
     <php>
+        <server name="KERNEL_CLASS" value="TestKernel"/>
         <server name="KERNEL_DIR" value="test/Functional/Fixtures"/>
     </php>
     <testsuites>
diff --git a/test/Functional/Fixtures/TestKernel.php b/test/Functional/Fixtures/TestKernel.php
index 8705a34..fc03883 100644
--- a/test/Functional/Fixtures/TestKernel.php
+++ b/test/Functional/Fixtures/TestKernel.php
@@ -1,5 +1,4 @@
 <?php
-
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpKernel\Kernel;
 
@@ -14,9 +13,9 @@ class TestKernel extends Kernel
     public function registerBundles()
     {
         return array(
-            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
-            new Iltar\HttpBundle\IltarHttpBundle(),
+            new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new \Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            new \Iltar\HttpBundle\IltarHttpBundle(),
         );
     }
 
diff --git a/test/IltarHttpBundleTest.php b/test/IltarHttpBundleTest.php
deleted file mode 100644
index 5f82273..0000000
--- a/test/IltarHttpBundleTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Iltar\HttpBundle;
-
-use Iltar\HttpBundle\DependencyInjection\DecorateRouterPass;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * @author Iltar van der Berg <kjarli@gmail.com>
- */
-class IltarHttpBundleTest extends \PHPUnit_Framework_TestCase
-{
-    public function testBuild()
-    {
-        $container = new ContainerBuilder();
-        $bundle = new IltarHttpBundle();
-
-        $bundle->build($container);
-
-        $passes = $container->getCompiler()->getPassConfig()->getBeforeOptimizationPasses();
-        self::assertInstanceOf(DecorateRouterPass::class, $passes[0]);
-    }
-}