diff --git a/src/test/java/teetime/framework/RunnableConsumerStageTest.java b/src/test/java/teetime/framework/RunnableConsumerStageTest.java
index 225eac81a88aa35a13c2b1638a6dec182c118644..fc92dcc63dad227dd604fb8067ceb1bacd78e623 100644
--- a/src/test/java/teetime/framework/RunnableConsumerStageTest.java
+++ b/src/test/java/teetime/framework/RunnableConsumerStageTest.java
@@ -54,6 +54,16 @@ public class RunnableConsumerStageTest {
 		thread.join();
 	}
 
+	@Test
+	public void testCorrectStartAndTerminatation() throws Exception {
+		RunnableConsumerStageTestConfiguration configuration = new RunnableConsumerStageTestConfiguration(0, 1, 2, 3, 5);
+
+		final Analysis analysis = new Analysis(configuration);
+		start(analysis);
+
+		assertEquals(5, configuration.getCollectedElements().size());
+	}
+
 	// @Test
 	// public void testWaitingInfinitely() throws Exception {
 	// WaitStrategyConfiguration waitStrategyConfiguration = new WaitStrategyConfiguration(300, 42);
diff --git a/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java b/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
index 1eb57d6b74b1109bf1a1b958bdf036dc37b1bead..0631e81b6f6015de3670b0eb0aab8369f46f2738 100644
--- a/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
+++ b/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
@@ -16,7 +16,9 @@ public class RunnableConsumerStageTestConfiguration extends AnalysisConfiguratio
 
 	public RunnableConsumerStageTestConfiguration(final Integer... inputElements) {
 		InitialElementProducer<Integer> producer = new InitialElementProducer<Integer>(inputElements);
-		// addThreadableStage(producer);
+		if (inputElements.length > 0) {
+			addThreadableStage(producer);
+		}
 
 		CollectorSink<Integer> collectorSink = new CollectorSink<Integer>(collectedElements);
 		addThreadableStage(collectorSink);