diff --git a/tests/all_tests.php b/tests/all_tests.php
index a6313bc15e..60a66598e7 100644
--- a/tests/all_tests.php
+++ b/tests/all_tests.php
@@ -15,7 +15,7 @@ if (!defined('PHPUnit_MAIN_METHOD'))
 	define('PHPUnit_MAIN_METHOD', 'phpbb_all_tests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
+require_once 'test_framework/framework.php';
 require_once 'PHPUnit/TextUI/TestRunner.php';
 
 require_once 'bbcode/all_tests.php';
diff --git a/tests/bbcode/all_tests.php b/tests/bbcode/all_tests.php
index 6703f67495..f4200fd0a9 100644
--- a/tests/bbcode/all_tests.php
+++ b/tests/bbcode/all_tests.php
@@ -15,7 +15,7 @@ if (!defined('PHPUnit_MAIN_METHOD'))
 	define('PHPUnit_MAIN_METHOD', 'phpbb_bbcode_all_tests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
+require_once 'test_framework/framework.php';
 require_once 'PHPUnit/TextUI/TestRunner.php';
 
 require_once 'bbcode/parser_test.php';
diff --git a/tests/bbcode/parser_test.php b/tests/bbcode/parser_test.php
index 5e44754478..729fe93fc2 100644
--- a/tests/bbcode/parser_test.php
+++ b/tests/bbcode/parser_test.php
@@ -10,7 +10,7 @@
 
 define('IN_PHPBB', true);
 
-require_once 'PHPUnit/Framework.php';
+require_once 'test_framework/framework.php';
 require_once '../phpBB/includes/bbcode/bbcode_parser_base.php';
 require_once '../phpBB/includes/bbcode/bbcode_parser.php';
 
diff --git a/tests/security/all_tests.php b/tests/security/all_tests.php
index bc482f1f90..0132e594b9 100644
--- a/tests/security/all_tests.php
+++ b/tests/security/all_tests.php
@@ -15,7 +15,7 @@ if (!defined('PHPUnit_MAIN_METHOD'))
 	define('PHPUnit_MAIN_METHOD', 'phpbb_security_all_tests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
+require_once 'test_framework/framework.php';
 require_once 'PHPUnit/TextUI/TestRunner.php';
 
 require_once 'security/extract_current_page.php';
diff --git a/tests/security/extract_current_page.php b/tests/security/extract_current_page.php
index 95aa3be4c0..9e04649f80 100644
--- a/tests/security/extract_current_page.php
+++ b/tests/security/extract_current_page.php
@@ -10,12 +10,12 @@
 
 define('IN_PHPBB', true);
 
-require_once 'PHPUnit/Framework.php';
+require_once 'test_framework/framework.php';
 
 require_once '../phpBB/includes/functions.php';
 require_once '../phpBB/includes/session.php';
 
-class phpbb_security_extract_current_page_test extends PHPUnit_Framework_TestCase
+class phpbb_security_extract_current_page_test extends phpbb_test_case
 {
 	public static function security_variables()
 	{
diff --git a/tests/template/all_tests.php b/tests/template/all_tests.php
index 50f6aa6ee8..beb064a396 100644
--- a/tests/template/all_tests.php
+++ b/tests/template/all_tests.php
@@ -15,7 +15,7 @@ if (!defined('PHPUnit_MAIN_METHOD'))
 	define('PHPUnit_MAIN_METHOD', 'phpbb_template_all_tests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
+require_once 'test_framework/framework.php';
 require_once 'PHPUnit/TextUI/TestRunner.php';
 
 require_once 'template/template.php';
diff --git a/tests/template/template.php b/tests/template/template.php
index f3337c6842..72ad065acf 100644
--- a/tests/template/template.php
+++ b/tests/template/template.php
@@ -12,13 +12,13 @@ define('IN_PHPBB', true);
 define('PHP_EXT', 'php');
 define('PHPBB_ROOT_PATH', '../phpBB/');
 
-require_once 'PHPUnit/Framework.php';
+require_once 'test_framework/framework.php';
 
 require_once '../phpBB/includes/constants.php';
 require_once '../phpBB/includes/functions.php';
 require_once '../phpBB/includes/template.php';
 
-class phpbb_template_template_test extends PHPUnit_Framework_TestCase
+class phpbb_template_template_test extends phpbb_test_case
 {
 	private $template;
 	private function display($handle)
diff --git a/tests/text_processing/all_tests.php b/tests/text_processing/all_tests.php
index f49da23055..7bb84057a9 100644
--- a/tests/text_processing/all_tests.php
+++ b/tests/text_processing/all_tests.php
@@ -15,7 +15,7 @@ if (!defined('PHPUnit_MAIN_METHOD'))
 	define('PHPUnit_MAIN_METHOD', 'phpbb_text_processing_all_tests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
+require_once 'test_framework/framework.php';
 require_once 'PHPUnit/TextUI/TestRunner.php';
 
 require_once 'text_processing/make_clickable.php';
diff --git a/tests/text_processing/make_clickable.php b/tests/text_processing/make_clickable.php
index 1eb0449274..994cbd023c 100644
--- a/tests/text_processing/make_clickable.php
+++ b/tests/text_processing/make_clickable.php
@@ -10,12 +10,12 @@
 
 define('IN_PHPBB', true);
 
-require_once 'PHPUnit/Framework.php';
+require_once 'test_framework/framework.php';
 
 require_once '../phpBB/includes/functions.php';
 require_once '../phpBB/includes/functions_content.php';
 
-class phpbb_text_processing_make_clickable_test extends PHPUnit_Framework_TestCase
+class phpbb_text_processing_make_clickable_test extends phpbb_test_case
 {
 	public static function make_clickable_data()
 	{
diff --git a/tests/utf/all_tests.php b/tests/utf/all_tests.php
index 53b050f9d2..bee5df7365 100644
--- a/tests/utf/all_tests.php
+++ b/tests/utf/all_tests.php
@@ -15,7 +15,7 @@ if (!defined('PHPUnit_MAIN_METHOD'))
 	define('PHPUnit_MAIN_METHOD', 'phpbb_utf_all_tests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
+require_once 'test_framework/framework.php';
 require_once 'PHPUnit/TextUI/TestRunner.php';
 
 require_once 'utf/utf8_wordwrap_test.php';
diff --git a/tests/utf/utf8_clean_string_test.php b/tests/utf/utf8_clean_string_test.php
index 8e1d9f16ac..e7fa7280c9 100644
--- a/tests/utf/utf8_clean_string_test.php
+++ b/tests/utf/utf8_clean_string_test.php
@@ -10,13 +10,13 @@
 
 define('IN_PHPBB', true);
 
-require_once 'PHPUnit/Framework.php';
+require_once 'test_framework/framework.php';
 
 define(PHPBB_ROOT_PATH, '../phpBB/');
 define(PHP_EXT, 'php');
 require_once '../phpBB/includes/utf/utf_tools.php';
 
-class phpbb_utf_utf8_clean_string_test extends PHPUnit_Framework_TestCase
+class phpbb_utf_utf8_clean_string_test extends phpbb_test_case
 {
 	public static function cleanable_strings()
 	{
diff --git a/tests/utf/utf8_wordwrap_test.php b/tests/utf/utf8_wordwrap_test.php
index 26a3ebf26d..c35069d734 100644
--- a/tests/utf/utf8_wordwrap_test.php
+++ b/tests/utf/utf8_wordwrap_test.php
@@ -10,10 +10,10 @@
 
 define('IN_PHPBB', true);
 
-require_once 'PHPUnit/Framework.php';
+require_once 'test_framework/framework.php';
 require_once '../phpBB/includes/utf/utf_tools.php';
 
-class phpbb_utf_utf8_wordwrap_test extends PHPUnit_Framework_TestCase
+class phpbb_utf_utf8_wordwrap_test extends phpbb_test_case
 {
 	public function test_utf8_wordwrap_ascii()
 	{