diff --git a/.travis.yml b/.travis.yml
index 0c5e9cd1..31e46b6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,8 +26,6 @@ branches:
 
 matrix:
     fast_finish: true
-    allow_failures:
-        - php: hhvm
     include:
         - php: 5.5
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_VERSION=2.7.*
diff --git a/Tests/Resources/app/AppKernel.php b/Tests/Resources/app/AppKernel.php
index a6fb0780..ea794e3c 100644
--- a/Tests/Resources/app/AppKernel.php
+++ b/Tests/Resources/app/AppKernel.php
@@ -21,7 +21,11 @@ public function registerBundles()
      */
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load(__DIR__.'/config/config.yml');
+        $runtime = 'php';
+        if (defined('HHVM_VERSION')) {
+            $runtime = 'hhvm';
+        }
+        $loader->load(__DIR__.'/config/config_'.$runtime.'.yml');
     }
 
     /**
diff --git a/Tests/Resources/app/config/config_hhvm.yml b/Tests/Resources/app/config/config_hhvm.yml
new file mode 100644
index 00000000..307d6aa1
--- /dev/null
+++ b/Tests/Resources/app/config/config_hhvm.yml
@@ -0,0 +1,11 @@
+framework:
+  secret: php-http
+  test: ~
+
+# Do not use auto discovery
+httplug:
+  classes:
+    client: Http\Adapter\Guzzle6\Client
+    message_factory: Http\Message\MessageFactory\GuzzleMessageFactory
+    uri_factory: Http\Message\UriFactory\GuzzleUriFactory
+    stream_factory: Http\Message\StreamFactory\GuzzleStreamFactory
diff --git a/Tests/Resources/app/config/config.yml b/Tests/Resources/app/config/config_php.yml
similarity index 71%
rename from Tests/Resources/app/config/config.yml
rename to Tests/Resources/app/config/config_php.yml
index 5eb3fd27..a333a0cb 100644
--- a/Tests/Resources/app/config/config.yml
+++ b/Tests/Resources/app/config/config_php.yml
@@ -2,4 +2,5 @@ framework:
   secret: php-http
   test: ~
 
+# Use auto discovery
 httplug: ~