diff --git a/admin/tool/brickfield/settings.php b/admin/tool/brickfield/settings.php
index f7341923be6..c46b59a038b 100644
--- a/admin/tool/brickfield/settings.php
+++ b/admin/tool/brickfield/settings.php
@@ -77,8 +77,9 @@ if ($hassiteconfig) {
         manager::PLUGINNAME . '/analysistype',
         get_string('analysistype', manager::PLUGINNAME),
         get_string('analysistype_desc', manager::PLUGINNAME),
+        analysis::ANALYSISDISABLED,
         analysis::ANALYSISBYREQUEST,
-        analysis::ANALYSISBYREQUEST
+        analysis::ANALYSISDISABLED
     ));
 
     $settings->add(new admin_setting_configcheckbox(
diff --git a/admin/tool/brickfield/tests/behat/accessresults.feature b/admin/tool/brickfield/tests/behat/accessresults.feature
index 0036be6a50c..6dddd34136d 100644
--- a/admin/tool/brickfield/tests/behat/accessresults.feature
+++ b/admin/tool/brickfield/tests/behat/accessresults.feature
@@ -9,6 +9,8 @@ Feature: Brickfield activityresults
       | activity | name      | intro                              | course | idnumber |
       | label    | Label one | <b>Bold text is bold.</b>          | C1     | id001    |
       | label    | Label two | <a href="modle.org">Click here</a> | C1     | id002    |
+    And the following config values are set as admin:
+      | analysistype | 1 | tool_brickfield |
 
   @javascript
   Scenario: Test the Brickfield accessibility tool plugin
diff --git a/blocks/accessreview/tests/behat/accessreview.feature b/blocks/accessreview/tests/behat/accessreview.feature
index 8f1f2371ed8..1998b08d736 100644
--- a/blocks/accessreview/tests/behat/accessreview.feature
+++ b/blocks/accessreview/tests/behat/accessreview.feature
@@ -8,6 +8,8 @@ Feature: Block accessreview
     Given the following "courses" exist:
       | fullname | shortname | format |
       | Course 1 | C1        | topics |
+    And the following config values are set as admin:
+      | analysistype | 1 | tool_brickfield |
 
   Scenario: View accessreview block on a course
     Given I log in as "admin"
diff --git a/blocks/accessreview/tests/behat/accessreview_results.feature b/blocks/accessreview/tests/behat/accessreview_results.feature
index 0551bb97a72..9f6c1a7a264 100644
--- a/blocks/accessreview/tests/behat/accessreview_results.feature
+++ b/blocks/accessreview/tests/behat/accessreview_results.feature
@@ -12,6 +12,8 @@ Feature: Block accessreview results
       | activity | name      | intro                              | course | idnumber |
       | label    | Label one | <b>Bold text is bold.</b>          | C1     | id001    |
       | label    | Label two | <a href="modle.org">Click here</a> | C1     | id002    |
+    And the following config values are set as admin:
+      | analysistype | 1 | tool_brickfield |
 
   Scenario: View accessreview block results on a course
     Given I log in as "admin"