diff --git a/lib/autoloader.php b/lib/autoloader.php
index 87a07f6da1..117672aa3c 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -110,7 +110,7 @@ class Autoloader {
 				$split[1] = strtolower($split[1]);
 
 				if ($split[1] === 'core') {
-					$paths[] = \OC::$SERVERROOT . '/core/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
+					// Covered by PSR-4 autoloader
 				} else if ($split[1] === 'settings') {
 					$paths[] = \OC::$SERVERROOT . '/settings/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
 				} else {
diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php
index 6443d87a2e..c31c687163 100644
--- a/tests/lib/autoloader.php
+++ b/tests/lib/autoloader.php
@@ -77,9 +77,7 @@ class AutoLoader extends TestCase {
 	}
 
 	public function testLoadCoreNamespaceCore() {
-		$this->assertEquals([
-			\OC::$SERVERROOT . '/core/foo/bar.php', 
-		], $this->loader->findClass('OC\Core\Foo\Bar'));
+		$this->assertEquals([], $this->loader->findClass('OC\Core\Foo\Bar'));
 	}
 
 	public function testLoadCoreNamespaceSettings() {