diff --git a/elasticsearch/x-pack/shield/dev-tools/esvm/.esvmrc b/elasticsearch/x-pack/shield/dev-tools/esvm/.esvmrc
index d81aee3d840..82a46076c20 100644
--- a/elasticsearch/x-pack/shield/dev-tools/esvm/.esvmrc
+++ b/elasticsearch/x-pack/shield/dev-tools/esvm/.esvmrc
@@ -12,7 +12,6 @@
       "discovery": {
         "type": "zen",
         "zen.ping" : {
-          "multicast.enabled": false,
           "unicast.hosts": [ "127.0.0.1:9300", "127.0.0.1:9301" ]
         }
       },
diff --git a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/transport/ServerTransportFilterIntegrationTests.java b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/transport/ServerTransportFilterIntegrationTests.java
index a99d76914ba..9d70c39968b 100644
--- a/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/transport/ServerTransportFilterIntegrationTests.java
+++ b/elasticsearch/x-pack/shield/src/test/java/org/elasticsearch/shield/transport/ServerTransportFilterIntegrationTests.java
@@ -94,7 +94,6 @@ public class ServerTransportFilterIntegrationTests extends ShieldIntegTestCase {
                 .put("node.name", "my-test-node")
                 .put("network.host", "localhost")
                 .put("cluster.name", internalCluster().getClusterName())
-                .put("discovery.zen.ping.multicast.enabled", false)
                 .put("discovery.zen.ping.unicast.hosts", unicastHost)
                 .put("shield.transport.ssl", sslTransportEnabled())
                 .put("shield.audit.enabled", false)
@@ -127,7 +126,6 @@ public class ServerTransportFilterIntegrationTests extends ShieldIntegTestCase {
                 .put("node.name", "my-test-node")
                 .put("shield.user", "test_user:changeme")
                 .put("cluster.name", internalCluster().getClusterName())
-                .put("discovery.zen.ping.multicast.enabled", false)
                 .put("discovery.zen.ping.unicast.hosts", "localhost:" + randomClientPort)
                 .put("shield.transport.ssl", sslTransportEnabled())
                 .put("shield.audit.enabled", false)
diff --git a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/bench/WatcherExecutorServiceBenchmark.java b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/bench/WatcherExecutorServiceBenchmark.java
index cb70a829967..4386ba6883b 100644
--- a/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/bench/WatcherExecutorServiceBenchmark.java
+++ b/elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/bench/WatcherExecutorServiceBenchmark.java
@@ -49,7 +49,6 @@ public class WatcherExecutorServiceBenchmark {
             .put("network.host", "localhost")
             .put("script.disable_dynamic", false)
             .put("discovery.zen.ping.unicast.hosts", "localhost")
-            .put("discovery.zen.ping.multicast.enabled", false)
             .put("http.cors.enabled", true)
             .put("cluster.routing.allocation.disk.threshold_enabled", false)
 //                .put("recycler.page.limit.heap", "60%")