diff --git a/tests/ManifestBuilderTest.fixture.inc b/tests/ManifestBuilderTest.fixture.inc
index 5ee20358b..4b0955ae1 100644
--- a/tests/ManifestBuilderTest.fixture.inc
+++ b/tests/ManifestBuilderTest.fixture.inc
@@ -15,6 +15,16 @@ PHP
 	'sapphire/MyClass.php' => <<<PHP
 <?php
 
+interface MyInterface {
+	
+}
+interface OtherInterface {
+	
+}
+class BaseClass {
+	
+}
+
 /* This is a comment before */
 class MyClass extends Object {
 
@@ -22,11 +32,11 @@ class MyClass extends Object {
 
 /* This is a comment between */
 
-class MyClass_Other extends DataObject implements Something {
+class MyClass_Other extends DataObject implements MyInterface {
 
 }
 
-class MyClass_Final extends DataObject implements Something, OtherClass {
+class MyClass_Final extends DataObject implements MyInterface, OtherInterface {
 
 }
 
@@ -83,7 +93,7 @@ PHP
 	'sapphire/subdir/SubDirClass.php' => <<<PHP
 <?php
 
-class SubDirClass extends Something implements Else, Other {
+class SubDirClass extends BaseClass implements MyInterace, OtherInterface {
 
 }
 PHP
@@ -93,7 +103,7 @@ PHP
 	'otherdir/OtherFile.php' => <<<PHP
 <?php
 
-class OtherFile extends Object {
+class OtherFile extends BaseClass {
 
 }
 PHP
diff --git a/tests/ManifestBuilderTest.php b/tests/ManifestBuilderTest.php
index 0660f1185..3b9dc16b5 100644
--- a/tests/ManifestBuilderTest.php
+++ b/tests/ManifestBuilderTest.php
@@ -31,7 +31,6 @@ class ManifestBuilderTest extends SapphireTest {
 		$this->assertEquals(1, preg_match('/require_once\("[^"]+sapphire\/_config.php"\);/i', $manifest), "sapphire/_config.php included");
 	}
 	
-	
 	function testManifestIgnoresClassesInComments() {
 		$baseFolder = TEMP_FOLDER . '/manifest-test';
 		global $project;
@@ -69,6 +68,13 @@ class ManifestBuilderTest extends SapphireTest {
 		$this->assertNotContains('MyClass_InHeredocString', array_keys($manifestInfo['globals']['_ALL_CLASSES']['parents']));
 	}
 
+
+	function testClassNamesDontHaveToBeTheSameAsFileNames() {
+		$baseFolder = TEMP_FOLDER . '/manifest-test';
+		$manifestInfo = ManifestBuilder::get_manifest_info($baseFolder);
+		
+		$this->assertContains('BaseClass', array_keys($manifestInfo['globals']['_ALL_CLASSES']['exists']));
+	}
 	
 	protected $originalClassManifest, $originalProject, $originalAllClasses;
 	protected static $test_fixture_project;