diff --git a/core/tests/Drupal/Tests/Core/File/.DS_Store b/core/tests/Drupal/Tests/Core/File/.DS_Store
new file mode 100644
index 0000000..5235c97
Binary files /dev/null and b/core/tests/Drupal/Tests/Core/File/.DS_Store differ
diff --git a/core/tests/Drupal/Tests/Core/File/FileAccessCheckTest.php b/core/tests/Drupal/Tests/Core/File/FileAccessCheckTest.php
new file mode 100644
index 0000000..052146b
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/File/FileAccessCheckTest.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\File\FileAccessCheckTest.
+ */
+
+namespace {
+
+  /**
+   * FileAccessController uses file_uri_scheme(), which *is* available when using the
+   * Simpletest test runner, but not when using the PHPUnit test runner; hence
+   * this hack.
+   */
+
+  if (!function_exists('file_uri_scheme')) {
+
+    function file_uri_scheme($uri) {
+      return 'public';
+    }
+  }
+
+}
+
+namespace Drupal\Tests\Core\File {
+
+  use Drupal\Tests\UnitTestCase;
+  use Drupal\file\FileAccessController;
+  use Drupal\Core\DependencyInjection\ContainerBuilder;
+
+  /**
+   * Tests the file entity access controller.
+   *
+   * @group File
+   */
+  class FileAccessCheckTest extends UnitTestCase {
+
+    public static function getInfo() {
+      return array(
+        'name' => 'File Entity access check test',
+        'description' => 'Unit test of file entity access.',
+        'group' => 'File'
+      );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function setUp() {
+      parent::setUp();
+
+      $this->moduleHandler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
+      $this->moduleHandler->expects($this->at(0))
+        ->method('invokeAll')
+        ->with('entity_access')
+        ->will($this->returnValue(array()));
+
+      $this->moduleHandler->expects($this->at(1))
+        ->method('invokeAll')
+        ->with('_access')
+        ->will($this->returnValue(array()));
+
+      $this->container = new ContainerBuilder();
+      $this->container->set('module_handler', $this->moduleHandler);
+      \Drupal::setContainer($this->container);
+    }
+
+    /**
+     * Tests the method for checking access to a file entity.
+     */
+    public function testAccess() {
+
+      // Mock a user.
+      $account = $this->getMock('Drupal\Core\Session\AccountInterface');
+
+      // Mock an entity manager.
+      $entity_type = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
+
+      // Mock a 'file' entity.
+      $file = $this->getMockBuilder('Drupal\file\Entity\File')
+        ->disableOriginalConstructor()
+        ->getMock();
+
+      // Initialize the controller to test.
+      $controller = new FileAccessController($entity_type);
+
+      // Test the access method.
+      $this->assertSame($controller->access($file, 'view', 'und', $account), TRUE);
+    }
+
+  }
+}
\ No newline at end of file