diff --git a/tests/extension/ext/barfoo/acp/a_info.php b/tests/extension/ext/barfoo/acp/a_info.php
new file mode 100644
index 0000000000..cd7e4e574b
--- /dev/null
+++ b/tests/extension/ext/barfoo/acp/a_info.php
@@ -0,0 +1,16 @@
+<?php
+
+class phpbb_ext_barfoo_acp_a_info
+{
+	public function module()
+	{
+		return array(
+			'filename'	=> 'phpbb_ext_barfoo_acp_a_module',
+			'title'		=> 'Barfoo',
+			'version'	=> '3.1.0-dev',
+			'modes'		=> array(
+				'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')),
+			),
+		);
+	}
+}
diff --git a/tests/extension/ext/barfoo/acp/a_module.php b/tests/extension/ext/barfoo/acp/a_module.php
new file mode 100644
index 0000000000..5bedb49645
--- /dev/null
+++ b/tests/extension/ext/barfoo/acp/a_module.php
@@ -0,0 +1,5 @@
+<?php
+
+class phpbb_ext_barfoo_acp_a_module
+{
+}
diff --git a/tests/extension/ext/barfoo/ext.php b/tests/extension/ext/barfoo/ext.php
new file mode 100644
index 0000000000..2e11ece8d1
--- /dev/null
+++ b/tests/extension/ext/barfoo/ext.php
@@ -0,0 +1,5 @@
+<?php
+
+class phpbb_ext_barfoo_ext extends phpbb_extension_base
+{
+}
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index 1f311116f4..8a4fd3fd20 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -30,7 +30,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
 
 	public function test_available()
 	{
-		$this->assertEquals(array('bar', 'foo', 'vendor/moo'), array_keys($this->extension_manager->all_available()));
+		$this->assertEquals(array('bar', 'barfoo', 'foo', 'vendor/moo'), array_keys($this->extension_manager->all_available()));
 	}
 
 	public function test_enabled()
diff --git a/tests/extension/modules_test.php b/tests/extension/modules_test.php
index d24a3ec52f..fe71747c5d 100644
--- a/tests/extension/modules_test.php
+++ b/tests/extension/modules_test.php
@@ -10,6 +10,7 @@
 require_once dirname(__FILE__) . '/ext/foo/acp/a_info.php';
 require_once dirname(__FILE__) . '/ext/foo/mcp/a_info.php';
 require_once dirname(__FILE__) . '/ext/foo/acp/fail_info.php';
+require_once dirname(__FILE__) . '/ext/barfoo/acp/a_info.php';
 require_once dirname(__FILE__) . '/../../phpBB/includes/acp/acp_modules.php';
 
 class phpbb_extension_modules_test extends phpbb_test_case
@@ -145,7 +146,7 @@ class phpbb_extension_modules_test extends phpbb_test_case
 		$this->assertEquals(array(), $acp_modules);
 
 		// No specific module, module class set to false (will default to the above acp)
-		// Setting $use_all_available will have no effect here as the ext manager is just mocked
+		// Setting $use_all_available will cause get_module_infos() to also load not enabled extensions (barfoo)
 		$this->acp_modules->module_class = 'acp';
 		$acp_modules = $this->acp_modules->get_module_infos('', false, true);
 		$this->assertEquals(array(
@@ -165,6 +166,27 @@ class phpbb_extension_modules_test extends phpbb_test_case
 						'test'		=> array('title' => 'Test', 'auth' => '', 'cat' => array('ACP_GENERAL')),
 					),
 				),
+				'phpbb_ext_barfoo_acp_a_module' => array(
+					'filename'	=> 'phpbb_ext_barfoo_acp_a_module',
+					'title'		=> 'Barfoo',
+					'version'	=> '3.1.0-dev',
+					'modes'		=> array(
+						'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')),
+					),
+				)
+			), $acp_modules);
+
+		// Specific module set to disabled extension
+		$acp_modules = $this->acp_modules->get_module_infos('phpbb_ext_barfoo_acp_a_module', 'acp', true);
+		$this->assertEquals(array(
+				'phpbb_ext_barfoo_acp_a_module' => array(
+					'filename'	=> 'phpbb_ext_barfoo_acp_a_module',
+					'title'		=> 'Barfoo',
+					'version'	=> '3.1.0-dev',
+					'modes'		=> array(
+						'config'		=> array('title' => 'Config',	'auth' => '', 'cat' => array('ACP_MODS')),
+					),
+				)
 			), $acp_modules);
 	}
 }