2 files changed, 4 insertions, 47 deletions
diff --git a/tests/class_loader/all_tests.php b/tests/class_loader/all_tests.php
deleted file mode 100644
index 451a1b02c2..0000000000
--- a/tests/class_loader/all_tests.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2008 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if (!defined('PHPUnit_MAIN_METHOD'))
-{
-	define('PHPUnit_MAIN_METHOD', 'phpbb_class_loader_all_tests::main');
-}
-
-require_once 'test_framework/framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-require_once 'class_loader/class_loader_test.php';
-
-class phpbb_class_loader_all_tests
-{
-	public static function main()
-	{
-		PHPUnit_TextUI_TestRunner::run(self::suite());
-	}
-
-	public static function suite()
-	{
-		$suite = new PHPUnit_Framework_TestSuite('phpBB Class Loader');
-
-		$suite->addTestSuite('phpbb_class_loader_test');
-
-		return $suite;
-	}
-}
-
-if (PHPUnit_MAIN_METHOD == 'phpbb_class_loader_all_tests::main')
-{
-	phpbb_class_loader_all_tests::main();
-}
-
diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php
index ecfac8080d..aef4f1de07 100644
--- a/tests/class_loader/class_loader_test.php
+++ b/tests/class_loader/class_loader_test.php
@@ -8,17 +8,15 @@
 *
 */
 
-require_once 'test_framework/framework.php';
-require_once 'class_loader/cache_mock.php';
-
-require_once '../phpBB/includes/class_loader.php';
+require_once __DIR__ . '/cache_mock.php';
 
+require_once __DIR__ . '/../../phpBB/includes/class_loader.php';
 
 class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
 {
 	public function test_resolve_path()
 	{
-		$prefix = 'class_loader/';
+		$prefix = __DIR__ . '/';
 		$class_loader = new phpbb_class_loader($prefix);
 
 		$prefix .= 'includes/';
@@ -56,7 +54,7 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
 		$cache = new phpbb_cache_mock;
 		$cache->put('class_loader', array('phpbb_a_cached_name' => 'a/cached_name'));
 
-		$prefix = 'class_loader/';
+		$prefix = __DIR__ . '/';
 		$class_loader = new phpbb_class_loader($prefix, '.php', $cache);
 
 		$prefix .= 'includes/';