diff --git a/behat.yml b/behat.yml
index ba1f0b9..2f7a646 100644
--- a/behat.yml
+++ b/behat.yml
@@ -3,7 +3,7 @@ default:
     features: features
     bootstrap: %behat.paths.features%/contexts
   context:
-    class: FeatureContext
+    class: Silo\Context\FeatureContext
     parameters:
       debugDoctrine: false
       coverage: false
@@ -13,7 +13,7 @@ coverage:
     features: features
     bootstrap: %behat.paths.features%/contexts
   context:
-    class: FeatureContext
+    class: Silo\Context\FeatureContext
     parameters:
       debugDoctrine: false
       coverage: true
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 251f4da..d91705b 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,8 @@
   },
   "autoload": {
     "psr-4": {
-      "Silo\\": "server"
+      "Silo\\": "server",
+      "Silo\\Context\\": "features/contexts"
     }
   }
 }
diff --git a/features/contexts/AppAwareContextInterface.php b/features/contexts/AppAwareContextInterface.php
index d10fc41..4e8f691 100644
--- a/features/contexts/AppAwareContextInterface.php
+++ b/features/contexts/AppAwareContextInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Silo\Context;
+
 interface AppAwareContextInterface
 {
     public function setApp(\Silex\Application $app);
diff --git a/features/contexts/CoverageContext.php b/features/contexts/CoverageContext.php
index 92584e9..95659b4 100644
--- a/features/contexts/CoverageContext.php
+++ b/features/contexts/CoverageContext.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Silo\Context;
+
 use \Behat\Behat\Context\BehatContext;
 
 class CoverageContext extends BehatContext
diff --git a/features/contexts/FeatureContext.php b/features/contexts/FeatureContext.php
index 4f1a3f0..26b8874 100644
--- a/features/contexts/FeatureContext.php
+++ b/features/contexts/FeatureContext.php
@@ -1,22 +1,12 @@
 <?php
 
+namespace Silo\Context;
+
 use Behat\Behat\Context\BehatContext;
 use Behat\Gherkin\Node\TableNode;
 use Doctrine\Common\Collections\ArrayCollection;
 use Silo\Inventory\Model as Inventory;
 
-//
-// Require 3rd-party libraries here:
-//
-//   require_once 'PHPUnit/Autoload.php';
-//   require_once 'PHPUnit/Framework/Assert/Functions.php';
-//
-require_once __DIR__.'/CoverageContext.php';
-require_once __DIR__.'/ThenContext.php';
-require_once __DIR__.'/UnitContext.php';
-require_once __DIR__.'/SilexContext.php';
-require_once __DIR__.'/PrintDebugLogger.php';
-
 /**
  * Features context.
  */
diff --git a/features/contexts/PrintDebugLogger.php b/features/contexts/PrintDebugLogger.php
index 2b431b0..991a72e 100644
--- a/features/contexts/PrintDebugLogger.php
+++ b/features/contexts/PrintDebugLogger.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Silo\Context;
+
 class PrintDebugLogger implements \Doctrine\DBAL\Logging\SQLLogger
 {
     private $context;
diff --git a/features/contexts/SilexContext.php b/features/contexts/SilexContext.php
index 9762a99..f96d18c 100644
--- a/features/contexts/SilexContext.php
+++ b/features/contexts/SilexContext.php
@@ -1,10 +1,13 @@
 <?php
 
+namespace Silo\Context;
+
 use Behat\Behat\Context\BehatContext;
 use Symfony\Component\HttpKernel\Client;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Behat\Behat\Exception\PendingException;
 use Behat\Gherkin\Node\TableNode;
+use Silo\Context\AppAwareContextInterface;
 
 /**
  * @see Silex\WebTestCase
diff --git a/features/contexts/ThenContext.php b/features/contexts/ThenContext.php
index f2ed60f..c9962f4 100644
--- a/features/contexts/ThenContext.php
+++ b/features/contexts/ThenContext.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Silo\Context;
+
 use \Behat\Behat\Context\BehatContext;
 use Behat\Gherkin\Node\TableNode;
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/features/contexts/UnitContext.php b/features/contexts/UnitContext.php
index 34840cc..74879eb 100644
--- a/features/contexts/UnitContext.php
+++ b/features/contexts/UnitContext.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Silo\Context;
+
 use Behat\Behat\Context\BehatContext;
 use Silo\Inventory\Model as Inventory;