diff --git a/behat.yml b/behat.yml
new file mode 100644
index 0000000..d6ee862
--- /dev/null
+++ b/behat.yml
@@ -0,0 +1,7 @@
+default:
+  suites:
+    default:
+      contexts:
+        - WP_CLI\Tests\Context\FeatureContext
+      paths:
+        - features
diff --git a/composer.json b/composer.json
index b49acb6..69aede4 100644
--- a/composer.json
+++ b/composer.json
@@ -16,12 +16,11 @@
         "wp-cli/wp-cli": "^2"
     },
     "require-dev": {
-        "behat/behat": "~2.5",
-        "wp-cli/wp-cli-tests": "^2.1"
+        "wp-cli/wp-cli-tests": "^3.1"
     },
     "config": {
         "platform": {
-            "php": "5.4"
+            "php": "5.6"
         },
         "process-timeout": 7200,
         "sort-packages": true,
@@ -45,7 +44,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.x-dev"
+            "dev-main": "2.x-dev"
         },
         "commands": [
             "find"