diff --git a/behat.yml b/behat.yml
index ff5ce58..12dad86 100644
--- a/behat.yml
+++ b/behat.yml
@@ -3,10 +3,11 @@ default:
   suites:
     default:
       paths:
-        - tests/behat
+        - tests/behat/
       contexts:
         - Behat\MinkExtension\Context\MinkContext
         - PantheonSystems\PantheonWordPressUpstreamTests\Behat\AdminLogIn
+        - behat\features\bootstrap\WpRedisFeatureContext
   extensions:
     Behat\MinkExtension:
       # base_url set by ENV
diff --git a/bin/behat-prepare.sh b/bin/behat-prepare.sh
index 71d377c..5ba9ad9 100755
--- a/bin/behat-prepare.sh
+++ b/bin/behat-prepare.sh
@@ -30,9 +30,6 @@ set -ex
 terminus env:create  $TERMINUS_SITE.dev $TERMINUS_ENV
 terminus env:wipe $SITE_ENV --yes
 
-# Enable Redis
-terminus redis:enable $TERMINUS_SITE
-
 ###
 # Get all necessary environment details.
 ###
diff --git a/composer.json b/composer.json
index 9bc37b1..a5f0929 100644
--- a/composer.json
+++ b/composer.json
@@ -28,5 +28,9 @@
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true
     }
+  },
+  "autoload": {
+    "psr-4": { "behat\\features\\bootstrap\\": "tests/behat/features/bootstrap/" }
   }
+
 }
diff --git a/tests/behat/features/bootstrap/WpRedisFeatureContext.php b/tests/behat/features/bootstrap/WpRedisFeatureContext.php
new file mode 100644
index 0000000..16cc68f
--- /dev/null
+++ b/tests/behat/features/bootstrap/WpRedisFeatureContext.php
@@ -0,0 +1,35 @@
+<?php
+// features/bootstrap/WPRedisFeatureContext.php
+
+namespace behat\features\bootstrap;
+
+use Behat\Behat\Context\Context;
+
+class WpRedisFeatureContext implements Context
+{
+
+    /**
+     * Initializes context.
+     *
+     * Every scenario gets its own context instance.
+     * You can also pass arbitrary arguments to the
+     * context constructor through behat.yml.
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Waits a certain number of seconds.
+     *
+     * @param int $seconds
+     *   How long to wait.
+     *
+     * @When I wait :seconds second(s)
+     */
+    public function wait($seconds)
+    {
+        sleep($seconds);
+    }
+
+}
diff --git a/tests/behat/load-wp.feature b/tests/behat/load-wp.feature
index ca6eec8..51b7994 100644
--- a/tests/behat/load-wp.feature
+++ b/tests/behat/load-wp.feature
@@ -22,6 +22,7 @@ Feature: Load WordPress
     When I go to "/wp-admin/options-general.php"
     And I fill in "blogname" with "Pantheon WordPress Site"
     And I press "submit"
+    When I wait "1" second
     Then print current URL
     And I should see "Settings saved."
 
diff --git a/tests/behat/wp-redis.feature b/tests/behat/wp-redis.feature
index dec2f5f..0a69071 100644
--- a/tests/behat/wp-redis.feature
+++ b/tests/behat/wp-redis.feature
@@ -15,4 +15,10 @@ Feature: WP Redis
     Then I should see "Redis Calls:"
     And I should see "Cache Hits:"
     And I should see "Cache Misses:"
-    And I should see "- get:"
+    And I should see "Redis Calls:"
+
+    # We call the same page twice to give Redis an opportunity to cache
+    # something so that `get` actually fires.
+    When I am on "/?redis_debug"
+    Then I should see "Group:"
+    Then I should see "- get"