diff --git a/tests/acp/fixtures/modules.xml b/tests/unit/acp/fixtures/modules.xml
similarity index 100%
rename from tests/acp/fixtures/modules.xml
rename to tests/unit/acp/fixtures/modules.xml
diff --git a/tests/acp/move_module_test.php b/tests/unit/acp/move_module_test.php
similarity index 98%
rename from tests/acp/move_module_test.php
rename to tests/unit/acp/move_module_test.php
index 82b30487..08cdbdaf 100644
--- a/tests/acp/move_module_test.php
+++ b/tests/unit/acp/move_module_test.php
@@ -9,8 +9,8 @@
 
 namespace board3\portal\acp;
 
-require_once(dirname(__FILE__) . '/../../includes/functions.php');
-require_once(dirname(__FILE__) . '/../../acp/portal_module.php');
+require_once(dirname(__FILE__) . '/../../../includes/functions.php');
+require_once(dirname(__FILE__) . '/../../../acp/portal_module.php');
 
 class phpbb_acp_move_module_test extends \board3\portal\tests\testframework\database_test_case
 {
diff --git a/tests/functions/check_file_src_test.php b/tests/unit/functions/check_file_src_test.php
similarity index 87%
rename from tests/functions/check_file_src_test.php
rename to tests/unit/functions/check_file_src_test.php
index 32f0e47a..6edb1ed3 100644
--- a/tests/functions/check_file_src_test.php
+++ b/tests/unit/functions/check_file_src_test.php
@@ -7,8 +7,8 @@
 *
 */
 
-require_once(dirname(__FILE__) . '/../../includes/functions.php');
-require_once(dirname(__FILE__) . '/../../../../../includes/functions_acp.php');
+require_once(dirname(__FILE__) . '/../../../includes/functions.php');
+require_once(dirname(__FILE__) . '/../../../../../../includes/functions_acp.php');
 
 class phpbb_functions_check_file_src_test extends \board3\portal\tests\testframework\database_test_case
 {
diff --git a/tests/functions/fixtures/styles.xml b/tests/unit/functions/fixtures/styles.xml
similarity index 100%
rename from tests/functions/fixtures/styles.xml
rename to tests/unit/functions/fixtures/styles.xml
diff --git a/tests/functions/simple_test.php b/tests/unit/functions/simple_test.php
similarity index 85%
rename from tests/functions/simple_test.php
rename to tests/unit/functions/simple_test.php
index 87896847..b1a50e94 100644
--- a/tests/functions/simple_test.php
+++ b/tests/unit/functions/simple_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once(dirname(__FILE__) . '/../../includes/functions.php');
+require_once(dirname(__FILE__) . '/../../../includes/functions.php');
 
 class phpbb_functions_simple_test extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/functions/version_check_test.php b/tests/unit/functions/version_check_test.php
similarity index 94%
rename from tests/functions/version_check_test.php
rename to tests/unit/functions/version_check_test.php
index 58952f1a..0928cedc 100644
--- a/tests/functions/version_check_test.php
+++ b/tests/unit/functions/version_check_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once(dirname(__FILE__) . '/../../../../../includes/utf/utf_tools.php');
+require_once(dirname(__FILE__) . '/../../../../../../includes/utf/utf_tools.php');
 
 class phpbb_functions_version_check_test extends \board3\portal\tests\testframework\test_case
 {