diff --git a/tests/FullTestSuite.php b/tests/FullTestSuite.php
new file mode 100644
index 000000000..a5b86d13c
--- /dev/null
+++ b/tests/FullTestSuite.php
@@ -0,0 +1,43 @@
+<?php
+
+
+if(!class_exists('Object')) {
+	require_once("sapphire/core/Core.php");
+	global $databaseConfig;
+	DB::connect($databaseConfig);
+}
+
+//$c = new Controller;
+//$c->pushCurrent();
+
+class FullTestSuite {
+	public static function get_tests() {
+		ManifestBuilder::load_test_manifest();
+		$tests = ClassInfo::subclassesFor('SapphireTest');
+		array_shift($tests);
+		unset($tests['FunctionalTest']);
+
+		// Remove tests that don't need to be executed every time
+		unset($tests['PhpSyntaxTest']);
+
+		foreach($tests as $class => $v) {
+			$reflection = new ReflectionClass($class);
+			if (!$reflection->isInstantiable()) {
+				unset($tests[$class]);
+			}
+		}
+		return $tests;
+	}
+
+    public static function suite()
+    {
+        $suite = new PHPUnit_Framework_TestSuite();
+		$classList = self::get_tests();
+ 		foreach($classList as $className) {
+			$suite->addTest(new SapphireTestSuite($className));
+		}
+
+        return $suite;
+    }
+}
+