diff --git a/filebeat/tests/system/test_ml.py b/filebeat/tests/system/test_ml.py
index 80786090e7c9..7c798b155d7c 100644
--- a/filebeat/tests/system/test_ml.py
+++ b/filebeat/tests/system/test_ml.py
@@ -93,6 +93,9 @@ def _run_ml_test(self, setup_flag, modules_flag):
             "-c", cfgfile
         ]
 
+        # Skipping dashboard loading to speed up tests, unfortunately only works for setup and not --setup
+        cmd += ["-E", "setup.dashboards.enabled=false"]
+
         if setup_flag:
             cmd += ["--setup"]
         else:
diff --git a/libbeat/ml-importer/importer.go b/libbeat/ml-importer/importer.go
index 892c8dae47ad..fa0c84e0f0d7 100644
--- a/libbeat/ml-importer/importer.go
+++ b/libbeat/ml-importer/importer.go
@@ -229,7 +229,7 @@ func checkResponse(r []byte) error {
 
 	for _, feed := range resp.Datafeeds {
 		if !feed.Success {
-			if strings.HasPrefix(feed.Error.Msg, "[resource_already_exists_exception]") {
+			if strings.HasPrefix(feed.Error.Msg, "[status_exception] A datafeed") || strings.HasPrefix(feed.Error.Msg, "[resource_already_exists_exception]") {
 				logp.Debug("machine-learning", "Datafeed already exists: %s, error: %s", feed.ID, feed.Error.Msg)
 				continue
 			}