diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterInfoCollectorTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterInfoCollectorTests.java
index b59df8be7ec..55201ba97b8 100644
--- a/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterInfoCollectorTests.java
+++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/collector/cluster/ClusterInfoCollectorTests.java
@@ -20,7 +20,10 @@ import static org.hamcrest.Matchers.*;
 
 public class ClusterInfoCollectorTests extends AbstractCollectorTestCase {
 
-    @Test
+    // This test is muted for now until licensing stuff is updated.
+    // Right now AbstractCollectorTestCase only registers license for Marvel,
+    // so license count at line 56 will always be 1 even when Shield is enabled
+    @Test @AwaitsFix(bugUrl = "https://github.com/elastic/x-plugins/issues/683")
     public void testClusterInfoCollector() throws Exception {
         Collection<MarvelDoc> results = newClusterInfoCollector().doCollect();
         assertThat(results, hasSize(1));