diff --git a/core/src/main/java/net/thucydides/core/requirements/FileSystemRequirementsTagProvider.java b/core/src/main/java/net/thucydides/core/requirements/FileSystemRequirementsTagProvider.java
index 6ea929142a..2fd6924d14 100644
--- a/core/src/main/java/net/thucydides/core/requirements/FileSystemRequirementsTagProvider.java
+++ b/core/src/main/java/net/thucydides/core/requirements/FileSystemRequirementsTagProvider.java
@@ -52,7 +52,6 @@ public class FileSystemRequirementsTagProvider extends AbstractRequirementsTagPr
     private static final List<TestTag> NO_TEST_TAGS = Lists.newArrayList();
     public static final String STORY_EXTENSION = "story";
     public static final String FEATURE_EXTENSION = "feature";
-    private static final List<Requirement> NO_CHILD_REQUIREMENTS = Lists.newArrayList();
 
     private final String rootDirectoryPath;
     private final NarrativeReader narrativeReader;
diff --git a/serenity-junit/src/test/java/net/thucydides/junit/runners/WhenRunningTestBatches.java b/serenity-junit/src/test/java/net/thucydides/junit/runners/WhenRunningTestBatches.java
index 5f23f10b6a..2b901bb0be 100644
--- a/serenity-junit/src/test/java/net/thucydides/junit/runners/WhenRunningTestBatches.java
+++ b/serenity-junit/src/test/java/net/thucydides/junit/runners/WhenRunningTestBatches.java
@@ -1,5 +1,6 @@
 package net.thucydides.junit.runners;
 
+import net.serenitybdd.junit.runners.SerenityRunner;
 import net.thucydides.core.model.TestOutcome;
 import net.thucydides.core.steps.StepEventBus;
 import net.thucydides.core.util.MockEnvironmentVariables;
@@ -62,7 +63,7 @@ public WebDriver newFirefoxDriver(Capabilities profile) {
     @Test
     public void the_test_runner_records_the_steps_as_they_are_executed() throws InitializationError {
 
-        ThucydidesRunner runner = new ThucydidesRunner(SamplePassingScenario.class, webDriverFactory);
+        SerenityRunner runner = new SerenityRunner(SamplePassingScenario.class, webDriverFactory);
 
         runner.run(new RunNotifier());
 
diff --git a/serenity-junit/src/test/java/net/thucydides/samples/SamplePassingScenario.java b/serenity-junit/src/test/java/net/thucydides/samples/SamplePassingScenario.java
index 80ebd666f3..c50dc4f3f8 100644
--- a/serenity-junit/src/test/java/net/thucydides/samples/SamplePassingScenario.java
+++ b/serenity-junit/src/test/java/net/thucydides/samples/SamplePassingScenario.java
@@ -19,7 +19,7 @@ public class SamplePassingScenario {
     @Steps
     public SampleScenarioSteps steps;
 
-    @Test(timeout=10000)
+    @Test
     @WithTagValuesOf({"story:simple scenario", "iteration:I1"})
     public void happy_day_scenario() throws Throwable {
         steps.stepThatSucceeds();