diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 497654eb..abd06207 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -8,7 +8,7 @@
 */
 
 define('IN_PHPBB', true);
-$phpbb_root_path = '../../../';
+$phpbb_root_path = './../../';
 $phpEx = 'php';
 require_once $phpbb_root_path . 'includes/startup.' . $phpEx;
 
diff --git a/tests/systemtests/base_database_test.php b/tests/systemtests/base_database_test.php
index 753605bc..b2ded0c4 100644
--- a/tests/systemtests/base_database_test.php
+++ b/tests/systemtests/base_database_test.php
@@ -7,9 +7,9 @@
 *
 */
 
-namespace phpbbgallery\core\tests\systemtests;
+namespace board3\tests\systemtests;
 
-class base_database_test extends \phpbbgallery\core\tests\testframework\database_test_case
+class base_database_test extends \board3\tests\testframework\database_test_case
 {
 	public function getDataSet()
 	{
diff --git a/tests/systemtests/base_test.php b/tests/systemtests/base_test.php
index 3bd223f4..95040423 100644
--- a/tests/systemtests/base_test.php
+++ b/tests/systemtests/base_test.php
@@ -7,9 +7,9 @@
 *
 */
 
-namespace phpbbgallery\core\tests\systemtests;
+namespace board3\tests\systemtests;
 
-class base_test extends \phpbbgallery\core\tests\testframework\test_case
+class base_test extends \board3\tests\testframework\test_case
 {
 	public function test_check()
 	{
diff --git a/tests/testframework/database_test_case.php b/tests/testframework/database_test_case.php
index fcdf0261..12a15763 100644
--- a/tests/testframework/database_test_case.php
+++ b/tests/testframework/database_test_case.php
@@ -7,7 +7,7 @@
 *
 */
 
-namespace phpbbgallery\core\tests\testframework;
+namespace board3\tests\testframework;
 
 abstract class database_test_case extends \phpbb_database_test_case
 {
@@ -23,12 +23,12 @@ abstract class database_test_case extends \phpbb_database_test_case
 
 	protected function create_connection_manager($config)
 	{
-		return new \phpbbgallery\core\tests\testframework\database_test_connection_manager($config);
+		return new \board3\tests\testframework\database_test_connection_manager($config);
 	}
 
 	public function get_database_config()
 	{
-		$config = \phpbbgallery\core\tests\testframework\test_case_helpers::get_test_config();
+		$config = \board3\tests\testframework\test_case_helpers::get_test_config();
 
 		if (!isset($config['dbms']))
 		{
@@ -42,7 +42,7 @@ abstract class database_test_case extends \phpbb_database_test_case
 	{
 		if (!$this->test_case_helpers)
 		{
-			$this->test_case_helpers = new \phpbbgallery\core\tests\testframework\test_case_helpers($this);
+			$this->test_case_helpers = new \board3\tests\testframework\test_case_helpers($this);
 		}
 
 		return $this->test_case_helpers;
diff --git a/tests/testframework/database_test_connection_manager.php b/tests/testframework/database_test_connection_manager.php
index 4c88c2b7..d478dd9d 100644
--- a/tests/testframework/database_test_connection_manager.php
+++ b/tests/testframework/database_test_connection_manager.php
@@ -7,7 +7,7 @@
 *
 */
 
-namespace phpbbgallery\core\tests\testframework;
+namespace board3\tests\testframework;
 
 class database_test_connection_manager extends \phpbb_database_test_connection_manager
 {
diff --git a/tests/testframework/functional_test_case.php b/tests/testframework/functional_test_case.php
index 650b206a..62b51b66 100644
--- a/tests/testframework/functional_test_case.php
+++ b/tests/testframework/functional_test_case.php
@@ -7,7 +7,7 @@
 *
 */
 
-namespace phpbbgallery\core\tests\testframework;
+namespace board3\tests\testframework;
 
 abstract class functional_test_case extends \phpbb_functional_test_case
 {
diff --git a/tests/testframework/test_case.php b/tests/testframework/test_case.php
index f9c4b240..9ec1c53e 100644
--- a/tests/testframework/test_case.php
+++ b/tests/testframework/test_case.php
@@ -7,7 +7,7 @@
 *
 */
 
-namespace phpbbgallery\core\tests\testframework;
+namespace board3\tests\testframework;
 
 abstract class test_case extends \phpbb_test_case
 {
@@ -15,7 +15,7 @@ abstract class test_case extends \phpbb_test_case
 	{
 		if (!$this->test_case_helpers)
 		{
-			$this->test_case_helpers = new \phpbbgallery\core\tests\testframework\test_case_helpers($this);
+			$this->test_case_helpers = new \board3\tests\testframework\test_case_helpers($this);
 		}
 
 		return $this->test_case_helpers;
diff --git a/tests/testframework/test_case_helpers.php b/tests/testframework/test_case_helpers.php
index d3e4430d..b699569f 100644
--- a/tests/testframework/test_case_helpers.php
+++ b/tests/testframework/test_case_helpers.php
@@ -7,7 +7,7 @@
 *
 */
 
-namespace phpbbgallery\core\tests\testframework;
+namespace board3\tests\testframework;
 
 abstract class test_case_helpers extends \phpbb_test_case_helpers
 {