diff --git a/marvel/src/test/java/org/elasticsearch/marvel/MarvelPluginTests.java b/marvel/src/test/java/org/elasticsearch/marvel/MarvelPluginTests.java
index eeb80729c33..a366d5aec76 100644
--- a/marvel/src/test/java/org/elasticsearch/marvel/MarvelPluginTests.java
+++ b/marvel/src/test/java/org/elasticsearch/marvel/MarvelPluginTests.java
@@ -50,7 +50,7 @@ public class MarvelPluginTests extends MarvelIntegTestCase {
             assertNotNull(nodeInfo.getPlugins());
 
             boolean found = false;
-            for (PluginInfo plugin : nodeInfo.getPlugins().getInfos()) {
+            for (PluginInfo plugin : nodeInfo.getPlugins().getPluginInfos()) {
                 assertNotNull(plugin);
 
                 if (MarvelPlugin.NAME.equals(plugin.getName())) {
diff --git a/qa/smoke-test-plugins-ssl/src/test/resources/rest-api-spec/test/smoke_test_plugins_ssl/10_basic.yaml b/qa/smoke-test-plugins-ssl/src/test/resources/rest-api-spec/test/smoke_test_plugins_ssl/10_basic.yaml
index 6ae125ab28b..bd331636b1d 100644
--- a/qa/smoke-test-plugins-ssl/src/test/resources/rest-api-spec/test/smoke_test_plugins_ssl/10_basic.yaml
+++ b/qa/smoke-test-plugins-ssl/src/test/resources/rest-api-spec/test/smoke_test_plugins_ssl/10_basic.yaml
@@ -10,7 +10,7 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.15.name: license }
-    - match:  { nodes.$master.plugins.19.name: marvel-agent }
-    - match:  { nodes.$master.plugins.22.name: shield }
-    - match:  { nodes.$master.plugins.25.name: watcher }
+    - match:  { nodes.$master.plugins.13.name: license }
+    - match:  { nodes.$master.plugins.17.name: marvel-agent }
+    - match:  { nodes.$master.plugins.20.name: shield }
+    - match:  { nodes.$master.plugins.23.name: watcher }
diff --git a/shield/src/test/java/org/elasticsearch/test/ShieldIntegTestCase.java b/shield/src/test/java/org/elasticsearch/test/ShieldIntegTestCase.java
index bb79971db9e..8cb9b876265 100644
--- a/shield/src/test/java/org/elasticsearch/test/ShieldIntegTestCase.java
+++ b/shield/src/test/java/org/elasticsearch/test/ShieldIntegTestCase.java
@@ -126,7 +126,7 @@ public abstract class ShieldIntegTestCase extends ESIntegTestCase {
         for (NodeInfo nodeInfo : nodeInfos) {
             // TODO: disable this assertion for now, because the test framework randomly runs with mock plugins. Maybe we should run without mock plugins?
 //            assertThat(nodeInfo.getPlugins().getInfos(), hasSize(2));
-            Collection<String> pluginNames = nodeInfo.getPlugins().getInfos().stream().map(p -> p.getName()).collect(Collectors.toList());
+            Collection<String> pluginNames = nodeInfo.getPlugins().getPluginInfos().stream().map(p -> p.getName()).collect(Collectors.toList());
             assertThat("plugin [" + ShieldPlugin.NAME + "] not found in [" + pluginNames + "]", pluginNames.contains(ShieldPlugin.NAME), is(true));
             assertThat("plugin [" + licensePluginName() + "] not found in [" + pluginNames + "]", pluginNames.contains(licensePluginName()), is(true));
         }