diff --git a/cassandra-test-image/src/main/docker/ecc-entrypoint.sh b/cassandra-test-image/src/main/docker/ecc-entrypoint.sh
index 05650b00e..9a4323f6b 100755
--- a/cassandra-test-image/src/main/docker/ecc-entrypoint.sh
+++ b/cassandra-test-image/src/main/docker/ecc-entrypoint.sh
@@ -41,7 +41,8 @@ if [ -f /etc/certificates/.keystore ]; then
   sed -i "/client_encryption_options:/{n;s/enabled: false/enabled: true/}" "$CASSANDRA_CONF"/cassandra.yaml
 
   sed -i "s;keystore: .*;keystore: /etc/certificates/.keystore;g" "$CASSANDRA_CONF"/cassandra.yaml
-  sed -i "s/keystore_password: .*/keystore_password: ecctest/g" "$CASSANDRA_CONF"/cassandra.yaml
+  # Cassandra 5: 'keystore_password' must not be empty, e.g. remove comment if present
+  sed -ri "s/( *)(# *)?keystore_password: .*/\1keystore_password: ecctest/g" "$CASSANDRA_CONF"/cassandra.yaml
 
   sed -ri "s;(# )?truststore: .*;truststore: /etc/certificates/.truststore;g" "$CASSANDRA_CONF"/cassandra.yaml
   sed -ri "s/(# )?truststore_password: .*/truststore_password: ecctest/g" "$CASSANDRA_CONF"/cassandra.yaml
diff --git a/core/src/test/java/com/ericsson/bss/cassandra/ecchronos/core/AbstractCassandraContainerTest.java b/core/src/test/java/com/ericsson/bss/cassandra/ecchronos/core/AbstractCassandraContainerTest.java
index 3350ac94b..ff461b671 100644
--- a/core/src/test/java/com/ericsson/bss/cassandra/ecchronos/core/AbstractCassandraContainerTest.java
+++ b/core/src/test/java/com/ericsson/bss/cassandra/ecchronos/core/AbstractCassandraContainerTest.java
@@ -37,7 +37,14 @@ public class AbstractCassandraContainerTest
     @BeforeClass
     public static void setUpCluster()
     {
-        node = new CassandraContainer<>(DockerImageName.parse("cassandra:4.1.5"))
+        // This is set as an environment variable ('it.cassandra.version') in maven using the '-D' flag.
+        String cassandraVersion = System.getProperty("it.cassandra.version");
+        if (cassandraVersion == null)
+        {
+            // No environment version set, just use latest.
+            cassandraVersion = "latest";
+        }
+        node = new CassandraContainer<>(DockerImageName.parse("cassandra:" + cassandraVersion))
                 .withExposedPorts(9042, 7000, 7199)
                 .withEnv("CASSANDRA_DC", "DC1")
                 .withEnv("CASSANDRA_ENDPOINT_SNITCH", "GossipingPropertyFileSnitch")
diff --git a/pom.xml b/pom.xml
index 1beaf4688..f2cc0f122 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
         <!-- Integration tests -->
         <it.cassandra.memory>1073741824</it.cassandra.memory>
         <it.cassandra.heap>256M</it.cassandra.heap>
-        <it.cassandra.version>4.0</it.cassandra.version>
+        <it.cassandra.version>latest</it.cassandra.version>
     </properties>
 
     <dependencyManagement>