diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfiguration.java
index 7e43ba7a..6cb7c5aa 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfiguration.java
@@ -40,11 +40,11 @@ import com.netflix.client.RetryHandler;
 import com.netflix.client.config.DefaultClientConfigImpl;
 import com.netflix.client.config.IClientConfig;
 import com.netflix.loadbalancer.ConfigurationBasedServerList;
+import com.netflix.loadbalancer.DummyPing;
 import com.netflix.loadbalancer.ILoadBalancer;
 import com.netflix.loadbalancer.IPing;
 import com.netflix.loadbalancer.IRule;
 import com.netflix.loadbalancer.LoadBalancerBuilder;
-import com.netflix.loadbalancer.NoOpPing;
 import com.netflix.loadbalancer.Server;
 import com.netflix.loadbalancer.ServerList;
 import com.netflix.loadbalancer.ServerListFilter;
@@ -101,7 +101,7 @@ public class RibbonClientConfiguration {
 		if (this.propertiesFactory.isSet(IPing.class, name)) {
 			return this.propertiesFactory.get(IPing.class, config, name);
 		}
-		return new NoOpPing();
+		return new DummyPing();
 	}
 
 	@Bean
diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorIntegrationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorIntegrationTests.java
index f61b1f3c..7903016e 100644
--- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorIntegrationTests.java
+++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorIntegrationTests.java
@@ -29,7 +29,7 @@ import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.netflix.loadbalancer.ConfigurationBasedServerList;
-import com.netflix.loadbalancer.NoOpPing;
+import com.netflix.loadbalancer.DummyPing;
 import com.netflix.loadbalancer.Server;
 import com.netflix.loadbalancer.ZoneAvoidanceRule;
 import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
@@ -56,8 +56,8 @@ public class RibbonClientPreprocessorIntegrationTests {
 	}
 
 	@Test
-	public void pingDefaultsToNoOp() throws Exception {
-		NoOpPing.class.cast(getLoadBalancer().getPing());
+	public void pingDefaultsToDummy() throws Exception {
+		DummyPing.class.cast(getLoadBalancer().getPing());
 	}
 
 	@Test
diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorPropertiesOverridesIntegrationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorPropertiesOverridesIntegrationTests.java
index ffb9af59..c505e791 100644
--- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorPropertiesOverridesIntegrationTests.java
+++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonClientPreprocessorPropertiesOverridesIntegrationTests.java
@@ -69,9 +69,9 @@ public class RibbonClientPreprocessorPropertiesOverridesIntegrationTests {
 	}
 
 	@Test
-	public void pingOverridesToDummy() throws Exception {
-		DummyPing.class.cast(getLoadBalancer("foo2").getPing());
-		NoOpPing.class.cast(getLoadBalancer("bar").getPing());
+	public void pingOverridesToNoOp() throws Exception {
+		NoOpPing.class.cast(getLoadBalancer("foo2").getPing());
+		DummyPing.class.cast(getLoadBalancer("bar").getPing());
 	}
 
 	@Test
diff --git a/spring-cloud-netflix-core/src/test/resources/application.yml b/spring-cloud-netflix-core/src/test/resources/application.yml
index dd7d5dea..deba4141 100644
--- a/spring-cloud-netflix-core/src/test/resources/application.yml
+++ b/spring-cloud-netflix-core/src/test/resources/application.yml
@@ -29,7 +29,7 @@ foo:
 # for RibbonClientPreprocessorPropertiesOverridesIntegrationTests
 foo2:
   ribbon:
-    NFLoadBalancerPingClassName: com.netflix.loadbalancer.DummyPing
+    NFLoadBalancerPingClassName: com.netflix.loadbalancer.NoOpPing
     NFLoadBalancerRuleClassName: com.netflix.loadbalancer.RandomRule
     NIWSServerListClassName: org.springframework.cloud.netflix.ribbon.test.TestServerList
     NIWSServerListFilterClassName: com.netflix.loadbalancer.ServerListSubsetFilter