diff --git a/behat.varbase.yml b/behat.varbase.yml
index dc8274e13b57ffbfbf86621b7017cb3bb740eff9..4bc50a0fe415fcc7608b0e0e9d45de651b3e0021 100644
--- a/behat.varbase.yml
+++ b/behat.varbase.yml
@@ -6,7 +6,7 @@ default:
       paths:
         - %paths.base%/tests/features
       contexts:
-        - Drupal\varbase\tests\features\bootstrap\VarbaseContext:
+        - VarbaseContext:
             parameters:
               varbase_users:
                 webmaster: { email: 'webmaster@vardot.com', password: 'dD.123123ddd' }
@@ -16,7 +16,7 @@ default:
                 test_seo_admin: { email: 'seo.admin.test@vardot.com', password: 'dD.123123ddd' }
                 test_site_admin: { email: 'site.admin.test@vardot.com', password: 'dD.123123ddd' }
                 test_super_admin: { email: 'super.admin.test@vardot.com', password: 'dD.123123ddd' }
-        - Drupal\varbase\tests\features\bootstrap\SelectorsContext:
+        - SelectorsContext:
            parameters:
              selectors:
                ## Add all css selectors which you will use in most features.
diff --git a/tests/features/bootstrap/SelectorsContext.php b/tests/features/bootstrap/SelectorsContext.php
index 4f35c2b5101901748acb3a1633fe7418705e2de6..b7bb16221ebbf0f97a38cac965d5fdf9fced558c 100644
--- a/tests/features/bootstrap/SelectorsContext.php
+++ b/tests/features/bootstrap/SelectorsContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\varbase\tests\features\bootstrap;
+namespace Drupal\DrupalExtension\Context;
 
 use Drupal\DrupalExtension\Context\RawDrupalContext;
 use Behat\Behat\Context\SnippetAcceptingContext;
diff --git a/tests/features/bootstrap/VarbaseContext.php b/tests/features/bootstrap/VarbaseContext.php
index 830c6e46e1c551b49d4b8a8ab14902d729f9d000..4d5156afa6d3ec2afdcc65423f6303373b3f229d 100644
--- a/tests/features/bootstrap/VarbaseContext.php
+++ b/tests/features/bootstrap/VarbaseContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\varbase\tests\features\bootstrap;
+namespace Drupal\DrupalExtension\Context;
 
 use WebDriver\Exception;
 use Drupal\DrupalExtension\Context\RawDrupalContext;