diff --git a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle
index 5f3cc0dd..a7d2d7f5 100644
--- a/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle
+++ b/spring-geode-autoconfigure/spring-geode-autoconfigure.gradle
@@ -29,7 +29,7 @@ dependencies {
 	}
 
 	// Runtime Test dependency on Spring Cloud Services (SCS) to verify workaround to SCS problem!
-	testRuntime("io.pivotal.spring.cloud:spring-cloud-services-starter-service-registry:2.0.3.RELEASE") {
-		exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
-	}
+	// testRuntime("io.pivotal.spring.cloud:spring-cloud-services-starter-service-registry:2.0.3.RELEASE") {
+	//	exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+	// }
 }
diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/CacheNameAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/CacheNameAutoConfigurationIntegrationTests.java
index 9d1cac67..a4a9a298 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/CacheNameAutoConfigurationIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/CacheNameAutoConfigurationIntegrationTests.java
@@ -117,6 +117,9 @@ public class CacheNameAutoConfigurationIntegrationTests extends SpringBootApplic
 	@SpringBootApplication
 	@EnableGemFireMockObjects
 	@UseMemberName("MemberNameTest")
+	@ComponentScan(excludeFilters = {
+		@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = AnnotationNameAttributeTestConfiguration.class)
+	})
 	static class MemberNameAttributeTestConfiguration { }
 
 }
diff --git a/spring-geode/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java
index 619e239e..6f7e56ad 100644
--- a/spring-geode/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java
+++ b/spring-geode/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java
@@ -166,6 +166,8 @@ public class VcapPropertySourceUnitTests {
 			verify(mockEnvironment, times(1)).getPropertySources();
 			verify(propertySources, times(1)).get(eq("vcap"));
 			verify(mockPropertySource, times(1)).getName();
+			verify(mockPropertySource, times(1))
+				.containsProperty(eq("vcap.application.name"));
 			verifyNoMoreInteractions(mockPropertySource);
 		}
 	}