diff --git a/tests/CoreTest.php b/tests/CoreTest.php
index d1be47382..46ae937cb 100644
--- a/tests/CoreTest.php
+++ b/tests/CoreTest.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Tests for the core of sapphire, such as how the temporary
  * directory is determined throughout the framework.
@@ -21,26 +20,26 @@ class CoreTest extends SapphireTest {
 			$this->assertEquals(getTempFolder(), $this->tempPath);
 		} else {
 			// A typical Windows location for where sites are stored on IIS
-			$this->assertEquals(getTempFolder('C:\\inetpub\\wwwroot\\silverstripe'), getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe');
+			$this->assertEquals(getTempFolder('C:\\inetpub\\wwwroot\\silverstripe-test-project'), getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe-test-project');
 
 			// A typical Mac OS X location for where sites are stored
-			$this->assertEquals(getTempFolder('/Users/joebloggs/Sites/silverstripe'), getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe');
-			
+			$this->assertEquals(getTempFolder('/Users/joebloggs/Sites/silverstripe-test-project'), getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe-test-project');
+
 			// A typical Linux location for where sites are stored
-			$this->assertEquals(getTempFolder('/var/www/silverstripe'), getSysTempDir() . '/silverstripe-cache-var-www-silverstripe');
+			$this->assertEquals(getTempFolder('/var/www/silverstripe-test-project'), getSysTempDir() . '/silverstripe-cache-var-www-silverstripe-test-project');
 		}
 	}
 
 	public function tearDown() {
 		parent::tearDown();
-		if(file_exists(getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe')) {
-			rmdir(getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe');
+		if(file_exists(getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe-test-project')) {
+			rmdir(getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe-test-project');
 		}
-		if(file_exists(getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe')) {
-			rmdir(getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe');
+		if(file_exists(getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe-test-project')) {
+			rmdir(getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe-test-project');
 		}
-		if(file_exists(getSysTempDir() . '/silverstripe-cache-var-www-silverstripe')) {
-			rmdir(getSysTempDir() . '/silverstripe-cache-var-www-silverstripe');
+		if(file_exists(getSysTempDir() . '/silverstripe-cache-var-www-silverstripe-test-project')) {
+			rmdir(getSysTempDir() . '/silverstripe-cache-var-www-silverstripe-test-project');
 		}
 	}