diff --git a/behat.yml b/behat.yml
index c24bc58..ab7450d 100644
--- a/behat.yml
+++ b/behat.yml
@@ -2,7 +2,7 @@ default:
   suites:
     default:
       contexts:
-        - FeatureContext
+        - Drumkit\DrumkitContext
         - Drupal\DrupalExtension\Context\DrupalContext
         - Drupal\DrupalExtension\Context\MinkContext
         - Drupal\DrupalExtension\Context\MessageContext
diff --git a/features/bootstrap/DrumkitContext.php b/features/bootstrap/Drumkit/DrumkitContext.php
similarity index 100%
rename from features/bootstrap/DrumkitContext.php
rename to features/bootstrap/Drumkit/DrumkitContext.php
diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
deleted file mode 100644
index bc0787c..0000000
--- a/features/bootstrap/FeatureContext.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-require_once dirname(__FILE__) . '/DrumkitContext.php';
-
-/**
- * Defines application features from the specific context.
- */
-class FeatureContext extends DrumkitContext {}