diff --git a/classes/Autoload.php b/classes/Autoload.php
index 3db7fa93a..94b5fc995 100644
--- a/classes/Autoload.php
+++ b/classes/Autoload.php
@@ -88,7 +88,7 @@ class Autoload
 		if (substr($classname, -4) != 'Core')
 		{
 			// If requested class does not exist, load associated core class
-			if (isset($this->index[$classname]) && !$this->index[$classname])
+			if (isset($this->index[$classname]) && !$this->indexTest[$classname])
 			{
 				require_once($this->root_dir.$this->index[$classname.'Core']);
 				if (file_exists($this->root_dir.'override/'.$this->index[$classname.'Core']))
@@ -175,4 +175,3 @@ class Autoload
 		return $classes;
 	}
 }
-