diff --git a/.gitattributes b/.gitattributes
index 504e6b3..fd1bf2d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,3 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.travis.yml export-ignore
-/behat.yml.dist export-ignore
diff --git a/.gitignore b/.gitignore
index b747e27..61c232d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 /vendor
 
-/behat.yml
 /composer.lock
diff --git a/.travis.yml b/.travis.yml
index ed6ba62..6b87d74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,4 +29,4 @@ install:
 script:
     - composer validate --strict
 
-    - vendor/bin/behat --strict
+    - vendor/bin/behat --strict --config=test/behat.yml
diff --git a/README.md b/README.md
index e53d61f..18dfcb5 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ $ composer require friends-of-behat/symfony-extension --dev
 default:
     # ...
     extensions:
-        FriendsOfBehat\SymfonyExtension: Z
+        FriendsOfBehat\SymfonyExtension: ~
 ```
 
 3. Good luck & have fun!
diff --git a/composer.json b/composer.json
index cea4ffb..b76a13f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "friends-of-behat/symfony-extension",
-    "description": "Allows to overwrite suites' default settings.",
+    "description": "Integrates Behat with Symfony (both 2 and 3).",
     "license": "MIT",
     "authors": [
         {
@@ -18,7 +18,11 @@
     "require-dev": {
         "behat/mink": "^1.7",
         "behat/mink-browserkit-driver": "^1.3",
-        "behat/mink-extension": "^2.2"
+        "behat/mink-extension": "^2.2",
+        "symfony/framework-bundle": "^2.7|^3.0"
+    },
+    "suggest": {
+        "behat/mink-browserkit-driver": "^1.3"
     },
     "autoload": {
         "psr-4": { "FriendsOfBehat\\SymfonyExtension\\": "src/" }
diff --git a/behat.yml.dist b/test/behat.yml
similarity index 100%
rename from behat.yml.dist
rename to test/behat.yml