.../Tests}/Access/EditEntityAccessCheckTest.php    |    4 ++--
 .../Access/EditEntityFieldAccessCheckTest.php      |   21 +++++++-------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php b/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityAccessCheckTest.php
similarity index 97%
rename from core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php
rename to core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityAccessCheckTest.php
index de50fbf..ccf1dd5 100644
--- a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityAccessCheckTest.php
+++ b/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityAccessCheckTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Tests\edit\Access\EditEntityAccessCheckTest.
+ * Contains \Drupal\edit\Tests\Access\EditEntityAccessCheckTest.
  */
 
-namespace Drupal\edit\Tests\edit\Access;
+namespace Drupal\edit\Tests\Access;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php b/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityFieldAccessCheckTest.php
similarity index 94%
rename from core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php
rename to core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityFieldAccessCheckTest.php
index 962b9ed..ac43857 100644
--- a/core/modules/edit/lib/Drupal/edit/Tests/edit/Access/EditEntityFieldAccessCheckTest.php
+++ b/core/modules/edit/tests/Drupal/edit/Tests/Access/EditEntityFieldAccessCheckTest.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Tests\edit\Access\EditEntityFieldAccessCheckTest.
+ * Contains \Drupal\edit\Tests\Access\EditEntityFieldAccessCheckTest.
  */
 
-namespace Drupal\edit\Tests\edit\Access {
+namespace Drupal\edit\Tests\Access {
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
@@ -107,7 +107,6 @@ public function providerTestAccess() {
       ->method('access')
       ->will($this->returnValue(FALSE));
 
-    $empty_field = NULL;
     $field_with_access = $this->getMockBuilder('Drupal\field\Entity\Field')
       ->disableOriginalConstructor()
       ->getMock();
@@ -125,7 +124,7 @@ public function providerTestAccess() {
     $data[] = array($editable_entity, $field_with_access, AccessCheckInterface::ALLOW);
     $data[] = array($non_editable_entity, $field_with_access, AccessCheckInterface::DENY);
     $data[] = array($editable_entity, $field_without_access, AccessCheckInterface::DENY);
-    $data[] = array($editable_entity, $empty_field, AccessCheckInterface::DENY);
+    $data[] = array($non_editable_entity, $field_without_access, AccessCheckInterface::DENY);
 
     return $data;
   }
@@ -146,12 +145,13 @@ public function testAccess(EntityInterface $entity, FieldInterface $field = NULL
     $route = new Route('/edit/form/test_entity/1/body/und/full', array(), array('_access_edit_entity_field' => 'TRUE'));
     $request = new Request();
 
-    $this->fieldInfo->expects($this->any())
-      ->method('getField')
+    $entity_with_field = clone $entity;
+    $entity_with_field->expects($this->any())
+      ->method('get')
       ->will($this->returnValue($field));
 
     // Prepare the request to be valid.
-    $request->attributes->set('entity', $entity);
+    $request->attributes->set('entity', $entity_with_field);
     $request->attributes->set('entity_type', 'test_entity');
     $request->attributes->set('field_name', 'example');
     $request->attributes->set('langcode', Language::LANGCODE_NOT_SPECIFIED);
@@ -325,13 +325,6 @@ public function testAccessWithInvalidLanguage() {
 namespace {
 
   use Drupal\Core\Language\Language;
-  use Drupal\field\FieldInterface;
-
-  if (!function_exists('field_access')) {
-    function field_access($op, FieldInterface $field, $entity_type, $entity = NULL, $account = NULL) {
-      return $field->access();
-    }
-  }
 
   if (!function_exists('field_valid_language')) {
     function field_valid_language($langcode, $default = TRUE) {