diff --git a/qa/smoke-test-plugins-ssl/pom.xml b/qa/smoke-test-plugins-ssl/pom.xml
index 1ecf6b1959e..5856c70f463 100644
--- a/qa/smoke-test-plugins-ssl/pom.xml
+++ b/qa/smoke-test-plugins-ssl/pom.xml
@@ -101,6 +101,14 @@
                  </artifactItem>
 
                  <!-- open-source plugins -->
+                 <artifactItem>
+                   <groupId>org.elasticsearch.plugin</groupId>
+                   <artifactId>analysis-icu</artifactId>
+                   <version>${elasticsearch.version}</version>
+                   <type>zip</type>
+                   <overWrite>true</overWrite>
+                 </artifactItem>
+
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
                    <artifactId>analysis-kuromoji</artifactId>
@@ -109,6 +117,14 @@
                    <overWrite>true</overWrite>
                  </artifactItem>
 
+                 <artifactItem>
+                   <groupId>org.elasticsearch.plugin</groupId>
+                   <artifactId>analysis-phonetic</artifactId>
+                   <version>${elasticsearch.version}</version>
+                   <type>zip</type>
+                   <overWrite>true</overWrite>
+                 </artifactItem>
+
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
                    <artifactId>analysis-smartcn</artifactId>
@@ -127,15 +143,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>analysis-phonetic</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>analysis-icu</artifactId>
+                   <artifactId>cloud-azure</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -149,22 +157,6 @@
                    <overWrite>true</overWrite>
                  </artifactItem>
 
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>cloud-azure</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>cloud-aws</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
                    <artifactId>delete-by-query</artifactId>
@@ -175,7 +167,15 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>lang-python</artifactId>
+                   <artifactId>discovery-ec2</artifactId>
+                   <version>${elasticsearch.version}</version>
+                   <type>zip</type>
+                   <overWrite>true</overWrite>
+                 </artifactItem>
+
+                 <artifactItem>
+                   <groupId>org.elasticsearch.plugin</groupId>
+                   <artifactId>discovery-multicast</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -189,6 +189,22 @@
                    <overWrite>true</overWrite>
                  </artifactItem>
 
+                 <artifactItem>
+                   <groupId>org.elasticsearch.plugin</groupId>
+                   <artifactId>lang-python</artifactId>
+                   <version>${elasticsearch.version}</version>
+                   <type>zip</type>
+                   <overWrite>true</overWrite>
+                 </artifactItem>
+
+                 <artifactItem>
+                   <groupId>org.elasticsearch.plugin</groupId>
+                   <artifactId>mapper-murmur3</artifactId>
+                   <version>${elasticsearch.version}</version>
+                   <type>zip</type>
+                   <overWrite>true</overWrite>
+                 </artifactItem>
+
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
                    <artifactId>mapper-size</artifactId>
@@ -197,6 +213,23 @@
                    <overWrite>true</overWrite>
                  </artifactItem>
 
+                 <artifactItem>
+                   <groupId>org.elasticsearch.plugin</groupId>
+                   <artifactId>repository-s3</artifactId>
+                   <version>${elasticsearch.version}</version>
+                   <type>zip</type>
+                   <overWrite>true</overWrite>
+                 </artifactItem>
+
+                 <!-- Internal plugins for test purpose only -->
+                 <artifactItem>
+                   <groupId>org.elasticsearch.plugin</groupId>
+                   <artifactId>jvm-example</artifactId>
+                   <version>${elasticsearch.version}</version>
+                   <type>zip</type>
+                   <overWrite>true</overWrite>
+                 </artifactItem>
+
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
                    <artifactId>site-example</artifactId>
diff --git a/qa/smoke-test-plugins-ssl/rest-api-spec/test/smoke_test_plugins_ssl/10_basic.yaml b/qa/smoke-test-plugins-ssl/rest-api-spec/test/smoke_test_plugins_ssl/10_basic.yaml
index dd1ada2ec73..74bdd9ea020 100644
--- a/qa/smoke-test-plugins-ssl/rest-api-spec/test/smoke_test_plugins_ssl/10_basic.yaml
+++ b/qa/smoke-test-plugins-ssl/rest-api-spec/test/smoke_test_plugins_ssl/10_basic.yaml
@@ -10,7 +10,7 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.11.name: license }
-    - match:  { nodes.$master.plugins.13.name: marvel }
-    - match:  { nodes.$master.plugins.14.name: shield }
-    - match:  { nodes.$master.plugins.16.name: watcher }
+    - match:  { nodes.$master.plugins.13.name: license }
+    - match:  { nodes.$master.plugins.16.name: marvel }
+    - match:  { nodes.$master.plugins.18.name: shield }
+    - match:  { nodes.$master.plugins.20.name: watcher }
diff --git a/qa/smoke-test-plugins/pom.xml b/qa/smoke-test-plugins/pom.xml
index 9949adcaff9..792905e730c 100644
--- a/qa/smoke-test-plugins/pom.xml
+++ b/qa/smoke-test-plugins/pom.xml
@@ -99,6 +99,14 @@
                  </artifactItem>
 
                  <!-- open-source plugins -->
+                 <artifactItem>
+                   <groupId>org.elasticsearch.plugin</groupId>
+                   <artifactId>analysis-icu</artifactId>
+                   <version>${elasticsearch.version}</version>
+                   <type>zip</type>
+                   <overWrite>true</overWrite>
+                 </artifactItem>
+
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
                    <artifactId>analysis-kuromoji</artifactId>
@@ -107,6 +115,14 @@
                    <overWrite>true</overWrite>
                  </artifactItem>
 
+                 <artifactItem>
+                   <groupId>org.elasticsearch.plugin</groupId>
+                   <artifactId>analysis-phonetic</artifactId>
+                   <version>${elasticsearch.version}</version>
+                   <type>zip</type>
+                   <overWrite>true</overWrite>
+                 </artifactItem>
+
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
                    <artifactId>analysis-smartcn</artifactId>
@@ -125,15 +141,7 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>analysis-phonetic</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>analysis-icu</artifactId>
+                   <artifactId>cloud-azure</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -147,22 +155,6 @@
                    <overWrite>true</overWrite>
                  </artifactItem>
 
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>cloud-azure</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>cloud-aws</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
                    <artifactId>delete-by-query</artifactId>
@@ -173,7 +165,15 @@
 
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>lang-python</artifactId>
+                   <artifactId>discovery-ec2</artifactId>
+                   <version>${elasticsearch.version}</version>
+                   <type>zip</type>
+                   <overWrite>true</overWrite>
+                 </artifactItem>
+
+                 <artifactItem>
+                   <groupId>org.elasticsearch.plugin</groupId>
+                   <artifactId>discovery-multicast</artifactId>
                    <version>${elasticsearch.version}</version>
                    <type>zip</type>
                    <overWrite>true</overWrite>
@@ -187,6 +187,22 @@
                    <overWrite>true</overWrite>
                  </artifactItem>
 
+                 <artifactItem>
+                   <groupId>org.elasticsearch.plugin</groupId>
+                   <artifactId>lang-python</artifactId>
+                   <version>${elasticsearch.version}</version>
+                   <type>zip</type>
+                   <overWrite>true</overWrite>
+                 </artifactItem>
+
+                 <artifactItem>
+                   <groupId>org.elasticsearch.plugin</groupId>
+                   <artifactId>mapper-murmur3</artifactId>
+                   <version>${elasticsearch.version}</version>
+                   <type>zip</type>
+                   <overWrite>true</overWrite>
+                 </artifactItem>
+
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
                    <artifactId>mapper-size</artifactId>
@@ -195,6 +211,23 @@
                    <overWrite>true</overWrite>
                  </artifactItem>
 
+                 <artifactItem>
+                   <groupId>org.elasticsearch.plugin</groupId>
+                   <artifactId>repository-s3</artifactId>
+                   <version>${elasticsearch.version}</version>
+                   <type>zip</type>
+                   <overWrite>true</overWrite>
+                 </artifactItem>
+
+                 <!-- Internal plugins for test purpose only -->
+                 <artifactItem>
+                   <groupId>org.elasticsearch.plugin</groupId>
+                   <artifactId>jvm-example</artifactId>
+                   <version>${elasticsearch.version}</version>
+                   <type>zip</type>
+                   <overWrite>true</overWrite>
+                 </artifactItem>
+
                  <artifactItem>
                    <groupId>org.elasticsearch.plugin</groupId>
                    <artifactId>site-example</artifactId>
diff --git a/qa/smoke-test-plugins/rest-api-spec/test/smoke_test_plugins/10_basic.yaml b/qa/smoke-test-plugins/rest-api-spec/test/smoke_test_plugins/10_basic.yaml
index dd1ada2ec73..74bdd9ea020 100644
--- a/qa/smoke-test-plugins/rest-api-spec/test/smoke_test_plugins/10_basic.yaml
+++ b/qa/smoke-test-plugins/rest-api-spec/test/smoke_test_plugins/10_basic.yaml
@@ -10,7 +10,7 @@
     - do:
         nodes.info: {}
 
-    - match:  { nodes.$master.plugins.11.name: license }
-    - match:  { nodes.$master.plugins.13.name: marvel }
-    - match:  { nodes.$master.plugins.14.name: shield }
-    - match:  { nodes.$master.plugins.16.name: watcher }
+    - match:  { nodes.$master.plugins.13.name: license }
+    - match:  { nodes.$master.plugins.16.name: marvel }
+    - match:  { nodes.$master.plugins.18.name: shield }
+    - match:  { nodes.$master.plugins.20.name: watcher }