diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java
index 9fb9bfd7..bed34070 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java
@@ -29,6 +29,12 @@ import java.util.Arrays;
 import java.util.Optional;
 import java.util.Properties;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
+
 import org.apache.geode.security.AuthenticationFailedException;
 import org.apache.geode.security.ResourcePermission;
 import org.junit.Test;
@@ -45,11 +51,6 @@ import org.springframework.util.StringUtils;
 
 import example.echo.config.EchoClientConfiguration;
 import example.echo.config.EchoServerConfiguration;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.ToString;
 
 /**
  * The {@link AbstractAutoConfiguredSecurityContextIntegrationTests} class is an abstract security context integration test class
@@ -68,8 +69,8 @@ import lombok.ToString;
 public abstract class AbstractAutoConfiguredSecurityContextIntegrationTests
 		extends ForkingClientServerIntegrationTestsSupport {
 
-	private static final String SECURITY_CONTEXT_USERNAME_PROPERTY = "security.context.username.property";
-	private static final String SECURITY_CONTEXT_PASSWORD_PROPERTY = "security.context.password.property";
+	private static final String SECURITY_CONTEXT_USERNAME_PROPERTY = "test.security.context.username";
+	private static final String SECURITY_CONTEXT_PASSWORD_PROPERTY = "test.security.context.password";
 
 	@Autowired
 	private GemfireTemplate echoTemplate;
diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java
index cd1879ff..3c101c0f 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java
@@ -27,7 +27,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.gemfire.config.annotation.CacheServerApplication;
 import org.springframework.data.gemfire.config.annotation.EnableLogging;
-import org.springframework.data.gemfire.support.GemfireBeanFactoryLocator;
 import org.springframework.data.gemfire.tests.integration.config.ClientServerIntegrationTestsConfiguration;
 import org.springframework.geode.boot.autoconfigure.security.auth.AbstractAutoConfiguredSecurityContextIntegrationTests;
 import org.springframework.test.annotation.DirtiesContext;
@@ -72,9 +71,6 @@ public class AutoConfiguredLocalSecurityContextIntegrationTests
 
 	@BeforeClass
 	public static void startGemFireServer() throws IOException {
-
-		GemfireBeanFactoryLocator.clear();
-
 		startGemFireServer(GemFireServerConfiguration.class,
 			"-Dspring.profiles.active=security-local-server");
 	}
diff --git a/spring-geode-autoconfigure/src/test/resources/application-security-local-client.properties b/spring-geode-autoconfigure/src/test/resources/application-security-local-client.properties
index 52b6a844..606716a6 100644
--- a/spring-geode-autoconfigure/src/test/resources/application-security-local-client.properties
+++ b/spring-geode-autoconfigure/src/test/resources/application-security-local-client.properties
@@ -1,4 +1,4 @@
-# Spring Boot application.properties for testing Apache Geode/Pivotal GemFire Security in a local context.
+# Spring Boot application.properties used in client for testing Apache Geode/Pivotal GemFire Security in a local context.
 
 spring.data.gemfire.security.username=ghostrider
 spring.data.gemfire.security.password=p@55w0rd
diff --git a/spring-geode-autoconfigure/src/test/resources/application-security-local-server.properties b/spring-geode-autoconfigure/src/test/resources/application-security-local-server.properties
index fec1b9e8..1d5bd480 100644
--- a/spring-geode-autoconfigure/src/test/resources/application-security-local-server.properties
+++ b/spring-geode-autoconfigure/src/test/resources/application-security-local-server.properties
@@ -1,4 +1,4 @@
-# Spring Boot application.properties for testing Apache Geode/Pivotal GemFire Security in a local context.
+# Spring Boot application.properties used in server for testing Apache Geode/Pivotal GemFire Security in a local context.
 
-security.context.username.property=ghostrider
-security.context.password.property=p@55w0rd
+test.security.context.username=ghostrider
+test.security.context.password=p@55w0rd