diff --git a/runbot/models/build_config.py b/runbot/models/build_config.py
index ab94801f..418bfa8f 100644
--- a/runbot/models/build_config.py
+++ b/runbot/models/build_config.py
@@ -109,7 +109,7 @@ class ConfigStep(models.Model):
     flamegraph = fields.Boolean('Allow Flamegraph', default=False, track_visibility='onchange')
     test_enable = fields.Boolean('Test enable', default=True, track_visibility='onchange')
     test_tags = fields.Char('Test tags', help="comma separated list of test tags", track_visibility='onchange')
-    enable_auto_tags = fields.Boolean('Allow auto tag', default=True, track_visibility='onchange')
+    enable_auto_tags = fields.Boolean('Allow auto tag', default=False, track_visibility='onchange')
     extra_params = fields.Char('Extra cmd args', track_visibility='onchange')
     additionnal_env = fields.Char('Extra env', help='Example: foo="bar",bar="foo". Cannot contains \' ', track_visibility='onchange')
     # python
@@ -333,6 +333,11 @@ class ConfigStep(models.Model):
                     cmd.extend(['--test-tags', test_tags])
             else:
                 build._log('test_all', 'Test tags given but not supported')
+        elif self.enable_auto_tags and self.test_enable:
+            auto_tags = self.env['runbot.build.error'].disabling_tags()
+            if auto_tags:
+                test_tags = ','.join(auto_tags)
+                cmd.extend(['--test-tags', test_tags])
 
         if grep(config_path, "--screenshots"):
             cmd += ['--screenshots', '/data/build/tests']
diff --git a/runbot/views/build_error_views.xml b/runbot/views/build_error_views.xml
index 3dd695e0..67ac339a 100644
--- a/runbot/views/build_error_views.xml
+++ b/runbot/views/build_error_views.xml
@@ -26,6 +26,7 @@
                 <field name="first_seen_build_id"/>
                 <field name="last_seen_date"/>
                 <field name="last_seen_build_id"/>
+                <field name="test_tags"/>
               </group>
               <notebook>
                 <page string="Builds">