diff --git a/tests/CoreTest.php b/tests/CoreTest.php
index be18dc2b7..ebf78de5b 100644
--- a/tests/CoreTest.php
+++ b/tests/CoreTest.php
@@ -9,49 +9,34 @@
  */
 class CoreTest extends SapphireTest {
 
-	protected $tempPath, $renamedTempPath;
+	protected $tempPath;
 
 	public function setUp() {
 		parent::setUp();
 		$this->tempPath = $tempPath = Director::baseFolder() . '/silverstripe-cache';
-		$this->renamedTempPath = $renamedTempPath = Director::baseFolder() . '/silverstripe-cache-1';
-		
-		// If the test failed (PHP error) this will need to be renamed
-		if(file_exists($renamedTempPath)) {
-			rename($renamedTempPath, $tempPath);
-		}
-		if(!file_exists($tempPath)) {
-			mkdir($tempPath);
-		}
 	}
 
 	public function testGetTempPathInProject() {
-		$this->assertEquals(getTempFolder(), $this->tempPath);
-		rename($this->tempPath, $this->tempPath . '-1');
-
-		// Store the original variable so we know what to change it back to
-		$old = $_SERVER['SCRIPT_FILENAME'];
-		
-		// A typical Windows location for where sites are stored on IIS
-		$_SERVER['SCRIPT_FILENAME'] = 'C:\inetpub\wwwroot\silverstripe\sapphire\main.php';
-		$this->assertEquals(getTempFolder(), getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe');
-		
-		// A typical Mac OS X location for where sites are stored
-		$_SERVER['SCRIPT_FILENAME'] = '/Users/joebloggs/Sites/silverstripe/sapphire/main.php';
-		$this->assertEquals(getTempFolder(), getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe');
-		
-		// A typical Linux location for where sites are stored
-		$_SERVER['SCRIPT_FILENAME'] = '/var/www/silverstripe/sapphire/main.php';
-		$this->assertEquals(getTempFolder(), getSysTempDir() . '/silverstripe-cache-var-www-silverstripe');
-		
-		// Restore the SCRIPT_FILENAME variable back to the original
-		$_SERVER['SCRIPT_FILENAME'] = $old;
-	}
-
-	public function tearDown() {
-		parent::tearDown();
-		if(file_exists($this->renamedTempPath)) {
-			rename($this->renamedTempPath, Director::baseFolder() . '/silverstripe-cache');
+		if(file_exists($this->tempPath)) {
+			$this->assertEquals(getTempFolder(), $this->tempPath);
+		} else {
+			// Store the original variable so we know what to change it back to
+			$old = $_SERVER['SCRIPT_FILENAME'];
+			
+			// A typical Windows location for where sites are stored on IIS
+			$_SERVER['SCRIPT_FILENAME'] = 'C:\\inetpub\\wwwroot\\silverstripe\\sapphire\\main.php';
+			$this->assertEquals(getTempFolder(), getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe');
+			
+			// A typical Mac OS X location for where sites are stored
+			$_SERVER['SCRIPT_FILENAME'] = '/Users/joebloggs/Sites/silverstripe/sapphire/main.php';
+			$this->assertEquals(getTempFolder(), getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe');
+			
+			// A typical Linux location for where sites are stored
+			$_SERVER['SCRIPT_FILENAME'] = '/var/www/silverstripe/sapphire/main.php';
+			$this->assertEquals(getTempFolder(), getSysTempDir() . '/silverstripe-cache-var-www-silverstripe');
+			
+			// Restore the SCRIPT_FILENAME variable back to the original
+			$_SERVER['SCRIPT_FILENAME'] = $old;
 		}
 	}