diff --git a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/MlJobIT.java b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/MlJobIT.java
index 915d9431c41..ece463a9239 100644
--- a/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/MlJobIT.java
+++ b/plugin/src/test/java/org/elasticsearch/xpack/ml/integration/MlJobIT.java
@@ -293,6 +293,7 @@ public class MlJobIT extends ESRestTestCase {
         assertThat(responseAsString, not(containsString(indexName)));
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/x-pack-elasticsearch/issues/584")
     public void testCreateJobInSharedIndexUpdatesMapping() throws Exception {
         String jobTemplate = "{\n" +
                 "  \"analysis_config\" : {\n" +