diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php
index e53507ded3..ecfac8080d 100644
--- a/tests/class_loader/class_loader_test.php
+++ b/tests/class_loader/class_loader_test.php
@@ -44,6 +44,11 @@ class phpbb_class_loader_test extends PHPUnit_Framework_TestCase
 			$class_loader->resolve_path('phpbb_dir_subdir_class_name'),
 			'Class in a sub-directory'
 		);
+		$this->assertEquals(
+			$prefix . 'dir2/dir2.php',
+			$class_loader->resolve_path('phpbb_dir2'),
+			'Class with name of dir within dir (short class name)'
+		);
 	}
 
 	public function test_resolve_cached()
diff --git a/tests/class_loader/includes/dir2/dir2.php b/tests/class_loader/includes/dir2/dir2.php
new file mode 100644
index 0000000000..01cf4086ff
--- /dev/null
+++ b/tests/class_loader/includes/dir2/dir2.php
@@ -0,0 +1,6 @@
+<?php
+
+class phpbb_dir2
+{
+}
+