diff --git a/core/control/Director.php b/core/control/Director.php
index ef3b32421..ed260b08a 100755
--- a/core/control/Director.php
+++ b/core/control/Director.php
@@ -646,7 +646,7 @@ class Director {
 		if($matched && !isset($_SERVER['HTTPS'])) {
 			$destURL = str_replace('http:', 'https:', Director::absoluteURL($_SERVER['REQUEST_URI']));
 
-			header("Location: $destURL");
+			if(!headers_sent()) header("Location: $destURL");
 			if(SapphireTest::is_running_test()) {
 				return $destURL;
 			} else {
diff --git a/tests/control/DirectorTest.php b/tests/control/DirectorTest.php
index bc5b0ead9..224c31256 100644
--- a/tests/control/DirectorTest.php
+++ b/tests/control/DirectorTest.php
@@ -5,7 +5,7 @@
  * 
  * @todo test Director::alternateBaseFolder()
  */
-class DirectorTest extends FunctionalTest {
+class DirectorTest extends SapphireTest {
 
 	function setUp() {
 		parent::setUp();