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 43603efd..5e27f42c 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
@@ -46,10 +46,12 @@ import org.springframework.util.StringUtils;
 
 import example.echo.config.EchoClientConfiguration;
 import example.echo.config.EchoServerConfiguration;
-import lombok.Data;
+import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+import lombok.Setter;
 import lombok.ToString;
 
 /**
@@ -162,15 +164,16 @@ public abstract class AbstractAutoConfiguredSecurityContextIntegrationTests
 		}
 	}
 
-	@Data
+	@Getter
 	@ToString(of = "name")
 	@EqualsAndHashCode(of = "name")
 	@RequiredArgsConstructor(staticName = "with")
 	static class User implements Principal, Serializable {
 
 		@NonNull
-		private String name;
+		private final String name;
 
+		@Setter(AccessLevel.PRIVATE)
 		private String password;
 
 		User having(String password) {
diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java
index 4c3a6f22..d38cd8dc 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java
@@ -77,7 +77,7 @@ public class AutoConfiguredCloudSecurityContextIntegrationTests
 		unsetTestAutoConfiguredPoolServersPortSystemProperty();
 	}
 
-	public static void loadVcapApplicationProperties() throws IOException {
+	private static void loadVcapApplicationProperties() throws IOException {
 
 		vcapApplicationProperties.load(new ClassPathResource(VCAP_APPLICATION_PROPERTIES).getInputStream());
 
@@ -85,7 +85,7 @@ public class AutoConfiguredCloudSecurityContextIntegrationTests
 			System.setProperty(property, vcapApplicationProperties.getProperty(property)));
 	}
 
-	public static void unsetTestAutoConfiguredPoolServersPortSystemProperty() {
+	private static void unsetTestAutoConfiguredPoolServersPortSystemProperty() {
 		System.clearProperty(GEMFIRE_POOL_SERVERS_PROPERTY);
 	}
 
diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/hybrid/AutoConfiguredHybridSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/hybrid/AutoConfiguredHybridSecurityContextIntegrationTests.java
index 8b22c460..056d2954 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/hybrid/AutoConfiguredHybridSecurityContextIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/hybrid/AutoConfiguredHybridSecurityContextIntegrationTests.java
@@ -85,7 +85,7 @@ public class AutoConfiguredHybridSecurityContextIntegrationTests
 		unsetTestAutoConfiguredPoolServersPortSystemProperty();
 	}
 
-	public static void loadVcapApplicationProperties() throws IOException {
+	private static void loadVcapApplicationProperties() throws IOException {
 
 		vcapApplicationProperties.load(new ClassPathResource(VCAP_APPLICATION_PROPERTIES).getInputStream());
 
@@ -93,7 +93,7 @@ public class AutoConfiguredHybridSecurityContextIntegrationTests
 			System.setProperty(property, vcapApplicationProperties.getProperty(property)));
 	}
 
-	public static void unsetTestAutoConfiguredPoolServersPortSystemProperty() {
+	private static void unsetTestAutoConfiguredPoolServersPortSystemProperty() {
 		System.clearProperty(GEMFIRE_POOL_SERVERS_PROPERTY);
 	}
 
diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/multi/AutoConfiguredMultiCloudCacheServiceInstanceSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/multi/AutoConfiguredMultiCloudCacheServiceInstanceSecurityContextIntegrationTests.java
index 7fb34e31..df82c6e2 100644
--- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/multi/AutoConfiguredMultiCloudCacheServiceInstanceSecurityContextIntegrationTests.java
+++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/multi/AutoConfiguredMultiCloudCacheServiceInstanceSecurityContextIntegrationTests.java
@@ -64,7 +64,7 @@ public class AutoConfiguredMultiCloudCacheServiceInstanceSecurityContextIntegrat
 
 	private static final String VCAP_APPLICATION_PROPERTIES = "application-vcap-multi.properties";
 
-	private static Properties vcapApplicationProperties = new Properties();
+	private static final Properties vcapApplicationProperties = new Properties();
 
 	@BeforeClass
 	public static void startGemFireServer() throws IOException {
@@ -74,7 +74,7 @@ public class AutoConfiguredMultiCloudCacheServiceInstanceSecurityContextIntegrat
 		unsetTestAutoConfiguredPoolServersPortSystemProperty();
 	}
 
-	public static void loadVcapApplicationProperties() throws IOException {
+	private static void loadVcapApplicationProperties() throws IOException {
 
 		vcapApplicationProperties.load(new ClassPathResource(VCAP_APPLICATION_PROPERTIES).getInputStream());
 
@@ -82,7 +82,7 @@ public class AutoConfiguredMultiCloudCacheServiceInstanceSecurityContextIntegrat
 			System.setProperty(property, vcapApplicationProperties.getProperty(property)));
 	}
 
-	public static void unsetTestAutoConfiguredPoolServersPortSystemProperty() {
+	private static void unsetTestAutoConfiguredPoolServersPortSystemProperty() {
 		System.clearProperty(GEMFIRE_POOL_SERVERS_PROPERTY);
 	}