diff --git a/src/Dev/TestSession.php b/src/Dev/TestSession.php
index d93d5016c..d6cdf698c 100644
--- a/src/Dev/TestSession.php
+++ b/src/Dev/TestSession.php
@@ -239,9 +239,9 @@ class TestSession {
 	 * @return SimplePage The response if available
 	 */
 	public function lastPage() {
-		require_once("thirdparty/simpletest/http.php");
-		require_once("thirdparty/simpletest/page.php");
-		require_once("thirdparty/simpletest/form.php");
+		require_once("simpletest/http.php");
+		require_once("simpletest/page.php");
+		require_once("simpletest/form.php");
 
 		$builder = new SimplePageBuilder();
 		if($this->lastResponse) {
diff --git a/conf/ConfigureFromEnv.php b/src/conf/ConfigureFromEnv.php
similarity index 100%
rename from conf/ConfigureFromEnv.php
rename to src/conf/ConfigureFromEnv.php
diff --git a/conf/_manifest_exclude b/src/conf/_manifest_exclude
similarity index 100%
rename from conf/_manifest_exclude
rename to src/conf/_manifest_exclude
diff --git a/tests/bootstrap/mysite.php b/tests/bootstrap/mysite.php
index d1b3092a4..90781792c 100644
--- a/tests/bootstrap/mysite.php
+++ b/tests/bootstrap/mysite.php
@@ -7,4 +7,4 @@ $project = 'mysite';
 global $database;
 $database = '';
 
-require_once(__DIR__ . '/../../conf/ConfigureFromEnv.php');
+require_once('conf/ConfigureFromEnv.php');