diff --git a/src/test/java/teetime/stage/basic/distributor/DistributorTest.java b/src/test/java/teetime/stage/basic/distributor/DistributorTest.java
index ecdeb41cde42135f1c2bb54d0eaf20cc628a7f84..3d637d253fe1c64e390a113bc0a7e963e1d5aaad 100644
--- a/src/test/java/teetime/stage/basic/distributor/DistributorTest.java
+++ b/src/test/java/teetime/stage/basic/distributor/DistributorTest.java
@@ -74,6 +74,29 @@ public class DistributorTest {
 		assertThat(this.secondIntegers, is(empty()));
 	}
 
+	@Test
+	public void roundRobin2ShouldWork() {
+		distributor.setStrategy(new RoundRobinStrategy2());
+
+		test(distributor).and().send(1, 2, 3, 4, 5).to(distributor.getInputPort()).and().receive(firstIntegers).from(distributor.getNewOutputPort()).and()
+				.receive(secondIntegers).from(distributor.getNewOutputPort()).start();
+
+		assertThat(this.firstIntegers, contains(1, 3, 5));
+		assertThat(this.secondIntegers, contains(2, 4));
+	}
+
+	@Test
+	public void singleElementRoundRobin2ShouldWork() {
+		distributor.setStrategy(new RoundRobinStrategy2());
+
+		test(distributor).and().send(1).to(distributor.getInputPort()).and().receive(firstIntegers).from(distributor.getNewOutputPort()).and()
+				.receive(secondIntegers)
+				.from(distributor.getNewOutputPort()).start();
+
+		assertThat(this.firstIntegers, contains(1));
+		assertThat(this.secondIntegers, is(empty()));
+	}
+
 	@Test
 	public void copyByReferenceShouldWork() {
 		distributor.setStrategy(new CopyByReferenceStrategy());