diff --git a/.gitattributes b/.gitattributes
index fd1bf2d..3d1aaa2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,6 @@
+/features export-ignore
+
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.travis.yml export-ignore
+/behat.yml.dist export-ignore
diff --git a/.gitignore b/.gitignore
index de4a392..5eb3730 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /vendor
 /composer.lock
+
+/behat.yml
diff --git a/behat.yml.dist b/behat.yml.dist
new file mode 100644
index 0000000..a94d08d
--- /dev/null
+++ b/behat.yml.dist
@@ -0,0 +1,5 @@
+default:
+    suites:
+        default:
+            contexts:
+                - FriendsOfBehat\TestContext\Context\TestContext
diff --git a/composer.json b/composer.json
index b76a13f..92114b8 100644
--- a/composer.json
+++ b/composer.json
@@ -19,6 +19,7 @@
         "behat/mink": "^1.7",
         "behat/mink-browserkit-driver": "^1.3",
         "behat/mink-extension": "^2.2",
+        "friends-of-behat/test-context": "^0.3",
         "symfony/framework-bundle": "^2.7|^3.0"
     },
     "suggest": {