diff --git a/htdocs/testing/frameworks/behat/classes/BehatConfigManager.php b/htdocs/testing/frameworks/behat/classes/BehatConfigManager.php
index 8853b360a38dc285c0857e15e291202dde30eb23..d9b705e5efd733e1527cc81e91e0999fb4a908da 100644
--- a/htdocs/testing/frameworks/behat/classes/BehatConfigManager.php
+++ b/htdocs/testing/frameworks/behat/classes/BehatConfigManager.php
@@ -78,7 +78,12 @@ class BehatConfigManager {
             'contexts' => $core_contexts,
             'filters'  => $core_filters,
         );
-
+        $gherkin_filters = array(
+            'tags' => '~@manual'
+        );
+        $gherkin = array(
+            'filters' => $gherkin_filters,
+        );
         // Get test suite config for each plugin
         // Gets all the plugins with features and/or contexts.
         $plugins = TestsFinder::get_plugins_with_tests('features');
@@ -98,7 +103,7 @@ class BehatConfigManager {
 
         // Behat config file specifing the main context class,
         // the required Behat extensions and Mahara test wwwroot.
-        $contents = self::get_config_file_contents($suites);
+        $contents = self::get_config_file_contents($suites, $gherkin);
 
         // Stores the file.
         check_dir_exists(dirname($configfilepath), true, true);
@@ -134,7 +139,7 @@ class BehatConfigManager {
      * @param array $suites
      * @return string
      */
-    protected static function get_config_file_contents($suites) {
+    protected static function get_config_file_contents($suites, $gherkin) {
         global $CFG;
 
         // We require here when we are sure behat dependencies are available.
@@ -175,6 +180,7 @@ class BehatConfigManager {
                        'loop_break' => 'true'
                      )
                 ),
+                'gherkin' => $gherkin,
                 'suites' => $suites
             )
         );
diff --git a/test/behat/features/settings/elasticsearch.feature b/test/behat/features/settings/elasticsearch.feature
index 8535612412ed87b5129e6448ca03315743946c2a..f74dc92753e8c6a3499eac1bfcc9199a30f45ad4 100644
--- a/test/behat/features/settings/elasticsearch.feature
+++ b/test/behat/features/settings/elasticsearch.feature
@@ -1,4 +1,4 @@
-@javascript @core @core_administration
+@javascript @core @core_administration @manual
 Feature: Configuration on elastic search
 In order to index and search the site using elasticsearch
 As an admin