diff --git a/jgiven-tests/src/main/java/com/tngtech/jgiven/tests/GivenTestStage.java b/jgiven-tests/src/main/java/com/tngtech/jgiven/tests/GivenTestStage.java
index b180fe75e5..198ee9d1bf 100644
--- a/jgiven-tests/src/main/java/com/tngtech/jgiven/tests/GivenTestStage.java
+++ b/jgiven-tests/src/main/java/com/tngtech/jgiven/tests/GivenTestStage.java
@@ -7,13 +7,15 @@ public GivenTestStage an_exception_is_thrown() {
         throw new RuntimeException("Some Exception");
     }
 
-    public void nothing() {
+    public GivenTestStage nothing() {
+        return this;
     }
 
-    public void a_failed_step(boolean fail) {
+    public GivenTestStage a_failed_step(boolean fail) {
         if (fail) {
             throw new IllegalArgumentException();
         }
+        return this;
     }
 
 
diff --git a/jgiven-tests/src/main/java/com/tngtech/jgiven/tests/WhenTestStage.java b/jgiven-tests/src/main/java/com/tngtech/jgiven/tests/WhenTestStage.java
index 24f4810931..8a46fe0adb 100644
--- a/jgiven-tests/src/main/java/com/tngtech/jgiven/tests/WhenTestStage.java
+++ b/jgiven-tests/src/main/java/com/tngtech/jgiven/tests/WhenTestStage.java
@@ -8,7 +8,7 @@ public WhenTestStage something_happens() {
         return self();
     }
 
-    public void a_step_fails() {
+    public WhenTestStage a_step_fails() {
         throw new AssertionError( "assertion failed in test step" );
     }