diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java
index 7f11281c..1734d9b1 100644
--- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java
+++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java
@@ -20,10 +20,12 @@ import java.net.InetSocketAddress;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.datastax.oss.driver.api.core.CqlSession;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -33,13 +35,9 @@ import org.springframework.cloud.vault.util.VaultRule;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.vault.core.VaultOperations;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
-// FIXME: 3.0.0
-//import com.datastax.driver.core.Cluster;
-//import com.datastax.driver.core.PlainTextAuthProvider;
-//import com.datastax.driver.core.Session;
-
 /**
  * Integration tests using the cassandra secret backend. In case this test should fail
  * because of SSL make sure you run the test within the
@@ -72,8 +70,8 @@ public class VaultConfigCassandraTests {
 	@Value("${spring.data.cassandra.password}")
 	String password;
 
-	// @Autowired
-	// Cluster cluster;
+	@Autowired
+	CqlSession cqlSession;
 
 	/**
 	 * Initialize the cassandra secret backend.
@@ -110,25 +108,18 @@ public class VaultConfigCassandraTests {
 	}
 
 	@Test
-	public void shouldConnectUsingCluster() {
-		// this.cluster.connect().close();
-	}
-
-	@Test
-	public void shouldUseAuthenticationSet() {
-		// assertThat(this.cluster.getConfiguration().getProtocolOptions().getAuthProvider())
-		// .isInstanceOf(PlainTextAuthProvider.class);
+	public void shouldUseAuthenticatedSession() {
+		assertThat(this.cqlSession.getMetadata().getKeyspace("system")).isNotEmpty();
 	}
 
 	@Test
 	public void shouldConnectUsingCassandraClient() {
 
-		// try (Cluster cluster = Cluster.builder().addContactPoint(CASSANDRA_HOST)
-		// .withAuthProvider(new PlainTextAuthProvider(this.username, this.password))
-		// .withoutJMXReporting().build()) {
-		// Session session = cluster.connect();
-		// session.close();
-		// }
+		try (CqlSession session = CqlSession.builder().withLocalDatacenter("dc1")
+				.addContactPoint(new InetSocketAddress(CASSANDRA_HOST, CASSANDRA_PORT))
+				.withAuthCredentials(this.username, this.password).build()) {
+			assertThat(session.getMetadata().getKeyspace("system")).isNotEmpty();
+		}
 	}
 
 	@SpringBootApplication
diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java
index a8be6c44..05a6e50f 100644
--- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java
+++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfigurationTests.java
@@ -48,6 +48,7 @@ public class VaultBootstrapPropertySourceConfigurationTests {
 	public void shouldConfigureExpiryTimeouts() {
 
 		this.contextRunner.withUserConfiguration(MockConfiguration.class)
+				.withAllowBeanDefinitionOverriding(true)
 				.withPropertyValues("spring.cloud.vault.generic.enabled=false",
 						"spring.cloud.vault.config.lifecycle.expiry-threshold=5m",
 						"spring.cloud.vault.config.lifecycle.min-renewal=6m",
diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java
index 8c9201e8..48c8bfcd 100644
--- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java
+++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfigurationTests.java
@@ -48,7 +48,8 @@ public class VaultReactiveBootstrapConfigurationTests {
 
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(
-					AutoConfigurations.of(VaultReactiveBootstrapConfiguration.class));
+					AutoConfigurations.of(VaultReactiveBootstrapConfiguration.class))
+			.withAllowBeanDefinitionOverriding(true);
 
 	@Test
 	public void shouldConfigureTemplate() {