diff --git a/behat.yml b/behat.yml
index c63767c..49b5979 100644
--- a/behat.yml
+++ b/behat.yml
@@ -10,7 +10,7 @@ default:
                 debug: true
                 path: Tests/app/AppKernel.php
                 bootstrap: Tests/app/autoload.php
-        VIPSoft\DoctrineDataFixturesExtension\Extension:
+        BehatExtension\DoctrineDataFixturesExtension\Extension:
             lifetime:    scenario
             autoload:    true
         Behat\MinkExtension:
diff --git a/composer.json b/composer.json
index 0b712c1..33cf75d 100644
--- a/composer.json
+++ b/composer.json
@@ -23,11 +23,11 @@
         "symfony/validator": "^2.8|^3.0",
 
         "doctrine/doctrine-fixtures-bundle": "^2.0",
-        "vipsoft/doctrine-data-fixtures-extension": "^3.0",
+        "behat-extension/doctrine-data-fixtures-extension": "dev-master",
         "behat/behat": "^3.0",
         "behat/symfony2-extension": "^2.0",
         "behat/mink": "*",
-        "behat/mink-extension": "*",
+        "behat/mink-extension": "^2.1",
         "behat/mink-browserkit-driver":  "*",
         "doctrine/orm": "^2.2",
         "symfony/var-dumper": "^2.8|^3.0"