diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableDeleteOperationSupportTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableDeleteOperationSupportIntegrationTests.java
similarity index 94%
rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableDeleteOperationSupportTests.java
rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableDeleteOperationSupportIntegrationTests.java
index 100ce13f3..e994a3b42 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableDeleteOperationSupportTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableDeleteOperationSupportIntegrationTests.java
@@ -40,7 +40,7 @@ import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingInte
  *
  * @author Mark Paluch
  */
-public class ExecutableDeleteOperationSupportTests extends AbstractKeyspaceCreatingIntegrationTest {
+public class ExecutableDeleteOperationSupportIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest {
 
 	CassandraAdminTemplate template;
 
@@ -52,7 +52,7 @@ public class ExecutableDeleteOperationSupportTests extends AbstractKeyspaceCreat
 
 		template = new CassandraAdminTemplate(session, new MappingCassandraConverter());
 		template.dropTable(true, CqlIdentifier.of("person"));
-		template.createTable(true, CqlIdentifier.of("person"), ExecutableInsertOperationSupportTests.Person.class,
+		template.createTable(true, CqlIdentifier.of("person"), ExecutableInsertOperationSupportIntegrationTests.Person.class,
 				Collections.emptyMap());
 
 		han = new Person();
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableInsertOperationSupportTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableInsertOperationSupportIntegrationTests.java
similarity index 96%
rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableInsertOperationSupportTests.java
rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableInsertOperationSupportIntegrationTests.java
index bda3abf4e..a0b2055c8 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableInsertOperationSupportTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableInsertOperationSupportIntegrationTests.java
@@ -36,7 +36,7 @@ import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingInte
  *
  * @author Mark Paluch
  */
-public class ExecutableInsertOperationSupportTests extends AbstractKeyspaceCreatingIntegrationTest {
+public class ExecutableInsertOperationSupportIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest {
 
 	CassandraAdminTemplate template;
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableSelectOperationSupportTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableSelectOperationSupportIntegrationTests.java
similarity index 98%
rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableSelectOperationSupportTests.java
rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableSelectOperationSupportIntegrationTests.java
index 6a7660d9b..706abbb67 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableSelectOperationSupportTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableSelectOperationSupportIntegrationTests.java
@@ -46,7 +46,7 @@ import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingInte
  *
  * @author Mark Paluch
  */
-public class ExecutableSelectOperationSupportTests extends AbstractKeyspaceCreatingIntegrationTest {
+public class ExecutableSelectOperationSupportIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest {
 
 	CassandraAdminTemplate template;
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableUpdateOperationSupportTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableUpdateOperationSupportIntegrationTests.java
similarity index 97%
rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableUpdateOperationSupportTests.java
rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableUpdateOperationSupportIntegrationTests.java
index 7681c73c2..2e68391ec 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableUpdateOperationSupportTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ExecutableUpdateOperationSupportIntegrationTests.java
@@ -41,7 +41,7 @@ import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingInte
  *
  * @author Mark Paluch
  */
-public class ExecutableUpdateOperationSupportTests extends AbstractKeyspaceCreatingIntegrationTest {
+public class ExecutableUpdateOperationSupportIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest {
 
 	CassandraAdminTemplate template;
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveDeleteOperationSupportTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveDeleteOperationSupportIntegrationTests.java
similarity index 95%
rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveDeleteOperationSupportTests.java
rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveDeleteOperationSupportIntegrationTests.java
index 52223ddab..681a15516 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveDeleteOperationSupportTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveDeleteOperationSupportIntegrationTests.java
@@ -43,7 +43,7 @@ import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingInte
  *
  * @author Mark Paluch
  */
-public class ReactiveDeleteOperationSupportTests extends AbstractKeyspaceCreatingIntegrationTest {
+public class ReactiveDeleteOperationSupportIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest {
 
 	CassandraAdminTemplate admin;
 
@@ -59,7 +59,7 @@ public class ReactiveDeleteOperationSupportTests extends AbstractKeyspaceCreatin
 		template = new ReactiveCassandraTemplate(new DefaultBridgedReactiveSession(session));
 
 		admin.dropTable(true, CqlIdentifier.of("person"));
-		admin.createTable(true, CqlIdentifier.of("person"), ExecutableInsertOperationSupportTests.Person.class,
+		admin.createTable(true, CqlIdentifier.of("person"), ExecutableInsertOperationSupportIntegrationTests.Person.class,
 				Collections.emptyMap());
 
 		han = new Person();
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveInsertOperationSupportTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveInsertOperationSupportIntegrationTests.java
similarity index 97%
rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveInsertOperationSupportTests.java
rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveInsertOperationSupportIntegrationTests.java
index aea057cfb..df4b41d90 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveInsertOperationSupportTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveInsertOperationSupportIntegrationTests.java
@@ -40,7 +40,7 @@ import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingInte
  *
  * @author Mark Paluch
  */
-public class ReactiveInsertOperationSupportTests extends AbstractKeyspaceCreatingIntegrationTest {
+public class ReactiveInsertOperationSupportIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest {
 
 	CassandraAdminTemplate admin;
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveSelectOperationSupportTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveSelectOperationSupportIntegrationTests.java
similarity index 98%
rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveSelectOperationSupportTests.java
rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveSelectOperationSupportIntegrationTests.java
index 17eccce30..53fdf5483 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveSelectOperationSupportTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveSelectOperationSupportIntegrationTests.java
@@ -49,7 +49,7 @@ import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingInte
  *
  * @author Mark Paluch
  */
-public class ReactiveSelectOperationSupportTests extends AbstractKeyspaceCreatingIntegrationTest {
+public class ReactiveSelectOperationSupportIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest {
 
 	CassandraAdminTemplate admin;
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveUpdateOperationSupportTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveUpdateOperationSupportIntegrationTests.java
similarity index 97%
rename from spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveUpdateOperationSupportTests.java
rename to spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveUpdateOperationSupportIntegrationTests.java
index b6190b9ed..d3aa0a869 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveUpdateOperationSupportTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/ReactiveUpdateOperationSupportIntegrationTests.java
@@ -45,7 +45,7 @@ import org.springframework.data.cassandra.test.util.AbstractKeyspaceCreatingInte
  *
  * @author Mark Paluch
  */
-public class ReactiveUpdateOperationSupportTests extends AbstractKeyspaceCreatingIntegrationTest {
+public class ReactiveUpdateOperationSupportIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest {
 
 	CassandraAdminTemplate admin;