diff --git a/spring-geode/src/test/java/example/app/crm/config/TestCassandraConfiguration.java b/spring-geode/src/test/java/example/app/crm/config/TestCassandraConfiguration.java
index 8a01de39..2e490dd9 100644
--- a/spring-geode/src/test/java/example/app/crm/config/TestCassandraConfiguration.java
+++ b/spring-geode/src/test/java/example/app/crm/config/TestCassandraConfiguration.java
@@ -52,18 +52,19 @@ public abstract class TestCassandraConfiguration extends AbstractCassandraConfig
 	private static final String KEYSPACE_NAME = "CustomerService";
 	private static final String SESSION_NAME = "CustomerServiceCluster";
 
-	@NonNull @Override
+	@NonNull
+	@Override
 	protected String getKeyspaceName() {
 		return KEYSPACE_NAME;
 	}
 
 	@Override
-	@SuppressWarnings("all")
 	protected String getLocalDataCenter() {
 		return LOCAL_DATA_CENTER;
 	}
 
-	@Nullable @Override
+	@Nullable
+	@Override
 	protected String getSessionName() {
 		return SESSION_NAME;
 	}
@@ -87,7 +88,7 @@ public abstract class TestCassandraConfiguration extends AbstractCassandraConfig
 		return startupScripts;
 	}
 
-	private List<String> readLines(Resource resource) {
+	private @NonNull List<String> readLines(@NonNull Resource resource) {
 
 		BufferedReader resourceReader = null;
 
diff --git a/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java b/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java
index 2c01985f..4d4d9824 100644
--- a/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java
+++ b/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java
@@ -42,8 +42,7 @@ public class TestcontainersCassandraConfiguration extends TestCassandraConfigura
 	@SuppressWarnings("rawtypes")
 	GenericContainer cassandraContainer() {
 
-		GenericContainer cassandraContainer = newCassandraContainer()
-			.withExposedPorts(CASSANDRA_DEFAULT_PORT);
+		GenericContainer cassandraContainer = newCustomCassandraContainer();
 
 		cassandraContainer.start();
 
@@ -52,11 +51,21 @@ public class TestcontainersCassandraConfiguration extends TestCassandraConfigura
 
 	@SuppressWarnings("rawtypes")
 	private GenericContainer newCassandraContainer() {
-		return new GenericContainer(CASSANDRA_DOCKER_IMAGE_NAME);
+		return new GenericContainer(CASSANDRA_DOCKER_IMAGE_NAME)
+			.withExposedPorts(CASSANDRA_DEFAULT_PORT);
+	}
+
+	@SuppressWarnings("rawtypes")
+	private GenericContainer newCustomCassandraContainer() {
+
+		return newCassandraContainer()
+			.withEnv("HEAP_NEWSIZE", "128M")
+			.withEnv("MAX_HEAP_SIZE", "1024M")
+			.withEnv("JVM_OPTS", "-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0")
+			.withEnv("CASSANDRA_SNITCH", "GossipingPropertyFileSnitch");
 	}
 
 	@Override
-	@SuppressWarnings("all")
 	protected String getContactPoints() {
 		return cassandraContainer().getContainerIpAddress();
 	}