diff --git a/src/test/java/teetime/examples/throughput/methodcall/MethodCallThroughputAnalysis16.java b/src/test/java/teetime/examples/throughput/methodcall/MethodCallThroughputAnalysis16.java
index 02a812a73352f43ede46d23a434e73c36ac73159..d9cade7b627e689d754312eb9f1efa0969cadf41 100644
--- a/src/test/java/teetime/examples/throughput/methodcall/MethodCallThroughputAnalysis16.java
+++ b/src/test/java/teetime/examples/throughput/methodcall/MethodCallThroughputAnalysis16.java
@@ -88,18 +88,7 @@ public class MethodCallThroughputAnalysis16 extends Analysis {
 
 		UnorderedGrowablePipe.connect(objectProducer.getOutputPort(), this.distributor.getInputPort());
 
-		final Runnable runnable = new Runnable() {
-			@Override
-			public void run() {
-				pipeline.onStart();
-				do {
-					pipeline.executeWithPorts();
-				} while (pipeline.isReschedulable());
-				// System.out.println("buildProducerPipeline finished");
-			}
-		};
-
-		return runnable;
+		return new RunnableStage(pipeline);
 	}
 
 	/**
@@ -136,18 +125,7 @@ public class MethodCallThroughputAnalysis16 extends Analysis {
 		UnorderedGrowablePipe.connect(noopFilters[noopFilters.length - 1].getOutputPort(), stopTimestampFilter.getInputPort());
 		UnorderedGrowablePipe.connect(stopTimestampFilter.getOutputPort(), collectorSink.getInputPort());
 
-		final Runnable runnable = new Runnable() {
-			@Override
-			public void run() {
-				pipeline.onStart();
-				do {
-					pipeline.executeWithPorts();
-				} while (pipeline.isReschedulable());
-				// System.out.println("buildPipeline finished");
-			}
-		};
-
-		return runnable;
+		return new RunnableStage(pipeline);
 	}
 
 	@Override
diff --git a/src/test/java/teetime/examples/throughput/methodcall/RunnableStage.java b/src/test/java/teetime/examples/throughput/methodcall/RunnableStage.java
new file mode 100644
index 0000000000000000000000000000000000000000..57107f5a0f056d689e557121c017e56f15e3f246
--- /dev/null
+++ b/src/test/java/teetime/examples/throughput/methodcall/RunnableStage.java
@@ -0,0 +1,20 @@
+package teetime.examples.throughput.methodcall;
+
+public class RunnableStage implements Runnable {
+
+	private final StageWithPort<?, ?> stage;
+
+	public RunnableStage(final StageWithPort<?, ?> stage) {
+		this.stage = stage;
+	}
+
+	@Override
+	public void run() {
+		this.stage.onStart();
+
+		do {
+			this.stage.executeWithPorts();
+		} while (this.stage.isReschedulable());
+	}
+
+}