diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/exporter/http/HttpExporterTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/exporter/http/HttpExporterTests.java
index 3741eb1bf7c..0ff26b351b1 100644
--- a/marvel/src/test/java/org/elasticsearch/marvel/agent/exporter/http/HttpExporterTests.java
+++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/exporter/http/HttpExporterTests.java
@@ -41,10 +41,13 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 
+import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
+
 
 // Transport Client instantiation also calls the marvel plugin, which then fails to find modules
 @SuppressLocalMode
 @ClusterScope(scope = TEST, transportClientRatio = 0.0, numDataNodes = 0, numClientNodes = 0)
+@AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/issues/729")
 public class HttpExporterTests extends MarvelIntegTestCase {
 
     final static AtomicLong timeStampGenerator = new AtomicLong();
diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsTests.java
index ba7007e5cf3..73f690eb83e 100644
--- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsTests.java
+++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/cluster/ClusterStatsTests.java
@@ -23,7 +23,10 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE;
 import static org.hamcrest.Matchers.greaterThan;
 
+import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
+
 @ClusterScope(scope = SUITE, maxNumDataNodes = 2)
+@AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/issues/729")
 public class ClusterStatsTests extends MarvelIntegTestCase {
 
     @Override