4 files changed, 16 insertions, 6 deletions
diff --git a/tests/extension/ext/foo/acp/a_info.php b/tests/extension/ext/foo/acp/a_info.php
index 3e9bbffaca..3b7d8cdd42 100644
--- a/tests/extension/ext/foo/acp/a_info.php
+++ b/tests/extension/ext/foo/acp/a_info.php
@@ -1,11 +1,13 @@
 <?php
 
-class phpbb_ext_foo_acp_a_info
+namespace foo\acp;
+
+class a_info
 {
 	public function module()
 	{
 		return array(
-			'filename'	=> 'phpbb_ext_foo_acp_a_module',
+			'filename'	=> 'foo\\acp\\a_module',
 			'title'		=> 'Foobar',
 			'version'	=> '3.1.0-dev',
 			'modes'		=> array(
diff --git a/tests/extension/ext/foo/acp/a_module.php b/tests/extension/ext/foo/acp/a_module.php
index 093b4b1ad7..7aa2351ab3 100644
--- a/tests/extension/ext/foo/acp/a_module.php
+++ b/tests/extension/ext/foo/acp/a_module.php
@@ -1,5 +1,7 @@
 <?php
 
-class phpbb_ext_foo_acp_a_module
+namespace foo\acp;
+
+class a_module
 {
 }
diff --git a/tests/extension/ext/foo/acp/fail_info.php b/tests/extension/ext/foo/acp/fail_info.php
index 99aa09551e..01d29fc5eb 100644
--- a/tests/extension/ext/foo/acp/fail_info.php
+++ b/tests/extension/ext/foo/acp/fail_info.php
@@ -1,14 +1,17 @@
 <?php
+
+namespace foo\acp;
+
 /*
 * Due to the mismatch between the class name and the file name, this module
 * file shouldn't be found by the extension finder
 */
-class phpbb_ext_foo_acp_foo_info
+class foo_info
 {
 	public function module()
 	{
 		return array(
-			'filename'	=> 'phpbb_ext_foo_acp_fail_module',
+			'filename'	=> 'foo\acp\fail_module',
 			'title'		=> 'Foobar',
 			'version'	=> '3.1.0-dev',
 			'modes'		=> array(
diff --git a/tests/extension/ext/foo/acp/fail_module.php b/tests/extension/ext/foo/acp/fail_module.php
index a200d92d2f..8070929d3c 100644
--- a/tests/extension/ext/foo/acp/fail_module.php
+++ b/tests/extension/ext/foo/acp/fail_module.php
@@ -1,8 +1,11 @@
 <?php
+
+namespace foo\acp;
+
 /*
 * Due to the mismatch between the class name and the file name of the module
 * info file, this module's info file shouldn't be found
 */
-class phpbb_ext_foo_acp_fail_module
+class fail_module
 {
 }