diff --git a/dev/SapphireTest.php b/dev/SapphireTest.php
index dd297be00..765c56cd9 100755
--- a/dev/SapphireTest.php
+++ b/dev/SapphireTest.php
@@ -350,7 +350,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
 	
 	function tearDown() {
 		// Preserve memory settings
-		ini_set('memory_limit', $this->originalMemoryLimit);
+		ini_set('memory_limit', ($this->originalMemoryLimit) ? $this->originalMemoryLimit : -1);
 
 		// Restore email configuration
 		Email::set_mailer($this->originalMailer);