diff --git a/.ahoy.yml b/.ahoy.yml
index 68e4dfe..3a0f683 100644
--- a/.ahoy.yml
+++ b/.ahoy.yml
@@ -14,7 +14,21 @@ commands:
       && if [ "$COMPOSER" != "composer.json" ] && [ "$DRUPAL_PROFILE" ]; then ahoy init-profile; fi \
       && ahoy install-site \
       && if [ "$COMPOSER" != "composer.json" ]; then ahoy init-module; fi \
-      && if [ "$COMPOSER" != "composer.json" ]; then ahoy drush pm-enable tide_test -y; fi \
+      && if [ "$COMPOSER" != "composer.json" ]; then \
+           ahoy drush pm-enable \
+             tide_test \
+             tide_landing_page \
+             tide_site \
+             tide_event \
+             tide_news \
+             tide_grant \
+             tide_api \
+             tide_media \
+             tide_webform \
+             tide_publication \
+             tide_alert \
+             -y; \
+         fi \
       && ahoy line "Build complete" \
       && ahoy info 1
 
diff --git a/behat.yml b/behat.yml
index 82888aa..d6ff4c1 100644
--- a/behat.yml
+++ b/behat.yml
@@ -7,9 +7,20 @@ default:
       tags: "~@suggest&&~@skipped"
   suites:
     default:
-      paths: [ '%paths.base%/tests/behat/features' ]
+      paths: 
+        - '%paths.base%/tests/behat/features'
+        - '%paths.base%/modules/tide_event/tests/behat/features'
+        - '%paths.base%/modules/tide_news/tests/behat/features'
+        - '%paths.base%/modules/tide_grant/tests/behat/features'
+        - '%paths.base%/modules/tide_site/tests/behat/features'
+        - '%paths.base%/modules/tide_landing_page/tests/behat/features'
+        - '%paths.base%/modules/tide_api/tests/behat/features'
+        - '%paths.base%/modules/tide_media/tests/behat/features'
+        - '%paths.base%/modules/tide_webform/tests/behat/features'
+        - '%paths.base%/modules/tide_publication/tests/behat/features'
+        - '%paths.base%/modules/tide_alert/tests/behat/features'
       contexts:
-      - FeatureContext
+      - Tide\Tests\Context\FeatureContext
       - Drupal\DrupalExtension\Context\MinkContext
       - Drupal\DrupalExtension\Context\MarkupContext
       - Drupal\DrupalExtension\Context\MessageContext
diff --git a/composer.dev.json b/composer.dev.json
index 2c3ecf7..4aff4c0 100644
--- a/composer.dev.json
+++ b/composer.dev.json
@@ -44,6 +44,9 @@
         "drupal/ckeditor": "*"
     },
     "autoload": {
+        "psr-4": {
+            "Tide\\Tests\\Context\\": "tests/behat/bootstrap/"
+        },
         "classmap": [
             "scripts/composer/"
         ]
diff --git a/tests/behat/bootstrap/FeatureContext.php b/tests/behat/bootstrap/FeatureContext.php
index a56f6b0..999f90d 100644
--- a/tests/behat/bootstrap/FeatureContext.php
+++ b/tests/behat/bootstrap/FeatureContext.php
@@ -5,6 +5,8 @@
  * Feature context for Behat testing.
  */
 
+namespace Tide\Tests\Context;
+
 use DrevOps\BehatSteps\ContentTrait;
 use DrevOps\BehatSteps\FieldTrait;
 use DrevOps\BehatSteps\JsTrait;
diff --git a/tests/behat/bootstrap/TideCommonTrait.php b/tests/behat/bootstrap/TideCommonTrait.php
index 40dc4b7..3d6f1a3 100644
--- a/tests/behat/bootstrap/TideCommonTrait.php
+++ b/tests/behat/bootstrap/TideCommonTrait.php
@@ -1,5 +1,6 @@
 <?php
 
+namespace Tide\Tests\Context;
 /**
  * Common test trait for Tide.
  *
diff --git a/tests/behat/bootstrap/TideEntityTrait.php b/tests/behat/bootstrap/TideEntityTrait.php
index a759ecc..b17e878 100644
--- a/tests/behat/bootstrap/TideEntityTrait.php
+++ b/tests/behat/bootstrap/TideEntityTrait.php
@@ -1,5 +1,6 @@
 <?php
 
+namespace Tide\Tests\Context;
 use Behat\Gherkin\Node\TableNode;
 
 /**
diff --git a/tests/behat/bootstrap/TideExtensionsTrait.php b/tests/behat/bootstrap/TideExtensionsTrait.php
index 996d270..e6bef7f 100644
--- a/tests/behat/bootstrap/TideExtensionsTrait.php
+++ b/tests/behat/bootstrap/TideExtensionsTrait.php
@@ -1,5 +1,6 @@
 <?php
 
+namespace Tide\Tests\Context;
 use Behat\Behat\Hook\Scope\AfterFeatureScope;
 use Behat\Behat\Hook\Scope\BeforeFeatureScope;
 use Behat\Gherkin\Node\FeatureNode;