diff --git a/plugins/riot/src/test/java/com/redis/riot/REServerStack.java b/plugins/riot/src/test/java/com/redis/riot/REServerStack.java
index a57377db9..43009f3f8 100644
--- a/plugins/riot/src/test/java/com/redis/riot/REServerStack.java
+++ b/plugins/riot/src/test/java/com/redis/riot/REServerStack.java
@@ -6,7 +6,7 @@
 import com.redis.testcontainers.RedisStackContainer;
 
 @EnabledIfEnvironmentVariable(named = RedisEnterpriseServer.ENV_HOST, matches = ".*")
-class REServerStack extends ReplicationTests {
+class REServerStack extends RiotTests {
 
 	private static final RedisEnterpriseServer source = RedisContainerFactory.enterpriseServer();
 	private static final RedisStackContainer target = RedisContainerFactory.stack();
diff --git a/plugins/riot/src/test/java/com/redis/riot/REStack.java b/plugins/riot/src/test/java/com/redis/riot/REStack.java
index 130afbfd2..41e8d1075 100644
--- a/plugins/riot/src/test/java/com/redis/riot/REStack.java
+++ b/plugins/riot/src/test/java/com/redis/riot/REStack.java
@@ -7,7 +7,7 @@
 import com.redis.testcontainers.RedisStackContainer;
 
 @EnabledOnOs(OS.LINUX)
-class REStack extends ReplicationTests {
+class REStack extends RiotTests {
 
 	private static final RedisEnterpriseContainer source = RedisContainerFactory.enterprise();
 	private static final RedisStackContainer target = RedisContainerFactory.stack();
diff --git a/plugins/riot/src/test/java/com/redis/riot/ReplicationTests.java b/plugins/riot/src/test/java/com/redis/riot/RiotTests.java
similarity index 95%
rename from plugins/riot/src/test/java/com/redis/riot/ReplicationTests.java
rename to plugins/riot/src/test/java/com/redis/riot/RiotTests.java
index ceacb950b..bce4b6741 100644
--- a/plugins/riot/src/test/java/com/redis/riot/ReplicationTests.java
+++ b/plugins/riot/src/test/java/com/redis/riot/RiotTests.java
@@ -34,7 +34,7 @@
 import io.lettuce.core.cluster.SlotHash;
 import io.lettuce.core.codec.ByteArrayCodec;
 
-abstract class ReplicationTests extends AbstractRiotTestBase {
+abstract class RiotTests extends AbstractRiotTestBase {
 
 	@BeforeAll
 	void setDefaults() {
@@ -168,17 +168,6 @@ private RedisArgs redisArgs(RedisServer redis) {
 		return args;
 	}
 
-	@Test
-	void replication(TestInfo info) throws Throwable {
-		generate(info, generator(73));
-		Assertions.assertTrue(redisCommands.dbsize() > 0);
-		Replicate replication = new Replicate();
-		execute(replication, info);
-		KeyspaceComparison<String> comparison = compare(info);
-		Assertions.assertFalse(comparison.getAll().isEmpty());
-		Assertions.assertEquals(Collections.emptyList(), comparison.mismatches());
-	}
-
 	@Test
 	void keyProcessor(TestInfo info) throws Throwable {
 		String key1 = "key1";
diff --git a/plugins/riot/src/test/java/com/redis/riot/StackREContainer.java b/plugins/riot/src/test/java/com/redis/riot/StackREContainer.java
index 9dfada468..0f2ead89d 100644
--- a/plugins/riot/src/test/java/com/redis/riot/StackREContainer.java
+++ b/plugins/riot/src/test/java/com/redis/riot/StackREContainer.java
@@ -7,7 +7,7 @@
 import com.redis.testcontainers.RedisStackContainer;
 
 @EnabledOnOs(OS.LINUX)
-class StackREContainer extends ReplicationTests {
+class StackREContainer extends RiotTests {
 
 	private static final RedisStackContainer source = RedisContainerFactory.stack();
 	private static final RedisEnterpriseContainer target = RedisContainerFactory.enterprise();
diff --git a/plugins/riot/src/test/java/com/redis/riot/StackREServer.java b/plugins/riot/src/test/java/com/redis/riot/StackREServer.java
index e0dd9f458..dc79288fe 100644
--- a/plugins/riot/src/test/java/com/redis/riot/StackREServer.java
+++ b/plugins/riot/src/test/java/com/redis/riot/StackREServer.java
@@ -6,7 +6,7 @@
 import com.redis.testcontainers.RedisStackContainer;
 
 @EnabledIfEnvironmentVariable(named = RedisEnterpriseServer.ENV_HOST, matches = ".*")
-public class StackREServer extends ReplicationTests {
+public class StackREServer extends RiotTests {
 
 	private static final RedisStackContainer source = RedisContainerFactory.stack();
 	private static final RedisEnterpriseServer target = RedisContainerFactory.enterpriseServer();
diff --git a/plugins/riot/src/test/java/com/redis/riot/StackReplicationTests.java b/plugins/riot/src/test/java/com/redis/riot/StackTests.java
similarity index 97%
rename from plugins/riot/src/test/java/com/redis/riot/StackReplicationTests.java
rename to plugins/riot/src/test/java/com/redis/riot/StackTests.java
index 44f68e53b..93fae9c4c 100644
--- a/plugins/riot/src/test/java/com/redis/riot/StackReplicationTests.java
+++ b/plugins/riot/src/test/java/com/redis/riot/StackTests.java
@@ -51,7 +51,7 @@
 import picocli.CommandLine.ExitCode;
 import picocli.CommandLine.ParseResult;
 
-class StackReplicationTests extends ReplicationTests {
+class StackTests extends RiotTests {
 
 	private static final RedisStackContainer source = RedisContainerFactory.stack();
 	private static final RedisStackContainer target = RedisContainerFactory.stack();
@@ -542,4 +542,15 @@ void replicateLiveOnlyStruct(TestInfo info) throws Exception {
 		Assertions.assertFalse(comparison.getAll().isEmpty());
 		Assertions.assertEquals(Collections.emptyList(), comparison.mismatches());
 	}
+
+	@Test
+	void replication(TestInfo info) throws Throwable {
+		generate(info, generator(73));
+		Assertions.assertTrue(redisCommands.dbsize() > 0);
+		Replicate replication = new Replicate();
+		execute(replication, info);
+		KeyspaceComparison<String> comparison = compare(info);
+		Assertions.assertFalse(comparison.getAll().isEmpty());
+		Assertions.assertEquals(Collections.emptyList(), comparison.mismatches());
+	}
 }