diff --git a/.travis.yml b/.travis.yml
index 5b834746..7dc57d6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,21 +16,19 @@ env:
 
 matrix:
   exclude:
-    - php: 5.3
-      env: DRUPAL_VERSION=8
     - php: 5.4
       env: DRUPAL_VERSION=8
     - php: 5.6
       env: DRUPAL_VERSION=6
     - php: 7.0
       env: DRUPAL_VERSION=6
-    - php: hhvm
-      env: DRUPAL_VERSION=6
   allow_failures:
     - php: 7.0
 
 install:
   - composer self-update
+  # Use the example composer.json file for Drupal 8.
+  - test ${DRUPAL_VERSION} -eq 8 && cp doc/_static/composer.json.d8 ./composer.json || true
   - composer install
   - composer global require drush/drush:dev-master --prefer-source
 
diff --git a/behat.yml.dist b/behat.yml.dist
index 6fc0c532..5338149a 100644
--- a/behat.yml.dist
+++ b/behat.yml.dist
@@ -42,7 +42,7 @@ drupal6:
         tags: "@d6"
   extensions:
     Behat\MinkExtension:
-      base_url: http://localhost:8888
+      base_url: http://127.0.0.1:8888
     Drupal\DrupalExtension:
       api_driver: "drupal"
       drupal:
@@ -65,7 +65,7 @@ drupal7:
         tags: "@d7"
   extensions:
     Behat\MinkExtension:
-      base_url: http://localhost:8888
+      base_url: http://127.0.0.1:8888
     Drupal\DrupalExtension:
       api_driver: "drupal"
       drupal:
@@ -90,7 +90,7 @@ drush:
         tags: "@drushTest"
   extensions:
     Behat\MinkExtension:
-      base_url: http://localhost:8888
+      base_url: http://127.0.0.1:8888
     Drupal\DrupalExtension:
       api_driver: "drush"
       drush_driver: "drush"
@@ -113,7 +113,7 @@ drupal8:
         tags: "@d8&&~@d8wip"
   extensions:
     Behat\MinkExtension:
-      base_url: http://localhost:8888
+      base_url: http://127.0.0.1:8888
     Drupal\DrupalExtension:
       api_driver: "drupal"
       drupal:
diff --git a/doc/_static/composer.json.d8 b/doc/_static/composer.json.d8
new file mode 100644
index 00000000..34579683
--- /dev/null
+++ b/doc/_static/composer.json.d8
@@ -0,0 +1,40 @@
+{
+  "name": "drupal/drupal-extension",
+  "type": "behat-extension",
+  "description": "Drupal extension for Behat",
+  "keywords": ["drupal", "web", "test"],
+  "homepage": "http://drupal.org/project/drupalextension",
+  "license": "GPL-2.0+",
+  "authors": [
+     {
+       "name": "Jonathan Hedstrom",
+       "email": "jhedstrom@gmail.com"
+     }
+  ],
+  "require": {
+    "behat/mink": "~1.5",
+    "behat/mink-goutte-driver": "~1.0",
+    "behat/mink-selenium2-driver": "~1.1",
+    "behat/behat": "~3.0,>=3.0.5",
+    "behat/mink-extension": "~2.0",
+    "drupal/drupal-driver": "~1.0@dev",
+    "guzzlehttp/guzzle" : "^6.0@dev"
+  },
+  "require-dev": {
+    "phpspec/phpspec": "~2.0",
+    "phpunit/phpunit": "3.7.*",
+    "behat/mink-zombie-driver": "^1.2"
+  },
+  "autoload": {
+    "psr-0": {
+      "Drupal\\Drupal": "src/",
+      "Drupal\\Exception": "src/",
+      "Drupal\\DrupalExtension": "src/"
+    }
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "3.0.x-dev"
+    }
+  }
+}
diff --git a/doc/localinstall.rst b/doc/localinstall.rst
index f571220e..5561b8e0 100644
--- a/doc/localinstall.rst
+++ b/doc/localinstall.rst
@@ -27,6 +27,12 @@ infrastructure. It also makes documentation consistent and reliable.
      :language: javascript 
      :linenos:
 
+  For Drupal 8, you'll need to specify the correct version of Guzzle:
+
+  .. literalinclude:: _static/snippets/composer.json.d8
+     : language: javascript
+     :linenos:
+
 4. Run the following command to install the Drupal Extension and all those
    dependencies. This takes a while before you start to see output::