diff --git a/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php
new file mode 100644
index 0000000..e803a3d
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Entity/ContentEntityDatabaseStorageTest.php
@@ -0,0 +1,115 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\Core\Entity\ContentEntityDatabaseStorageTest.
+ */
+
+namespace Drupal\Tests\Core\Entity;
+
+use Drupal\Core\Entity\ContentEntityDatabaseStorage;
+use Drupal\Core\Field\FieldDefinition;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Tests the fieldable database storage.
+ *
+ * @see \Drupal\Core\Entity\ContentEntityDatabaseStorage
+ *
+ * @group Drupal
+ * @group Entity
+ */
+class ContentEntityDatabaseStorageTest extends UnitTestCase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getInfo() {
+    return array(
+      'name' => 'Fieldable database storage',
+      'description' => 'Tests the fieldable database storage enhancer for entities.',
+      'group' => 'Entity'
+    );
+  }
+
+  /**
+   * Tests field SQL schema generation for an entity with a string identifier.
+   *
+   * @see \Drupal\Core\Entity\Controller\ContentEntityDatabaseStorage::_fieldSqlSchema()
+   */
+  public function testFieldSqlSchemaForEntityWithStringIdentifier() {
+    $field_type_manager = $this->getMock('Drupal\Core\Field\FieldTypePluginManagerInterface');
+    $entity_manager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
+
+    $container = new ContainerBuilder();
+    $container->set('plugin.manager.field.field_type', $field_type_manager);
+    $container->set('entity.manager', $entity_manager);
+    \Drupal::setContainer($container);
+
+    $definition = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
+    $definition->expects($this->any())
+      ->method('getKey')
+      ->will($this->returnValueMap(array(
+        array('id', 'id'),
+        array('revision_id', 'revision_id'),
+      )));
+    $definition->expects($this->once())
+      ->method('hasKey')
+      ->with('revision_id')
+      ->will($this->returnValue(TRUE));
+
+    $field_type_manager->expects($this->exactly(2))
+      ->method('getDefaultSettings')
+      ->will($this->returnValue(array()));
+    $field_type_manager->expects($this->exactly(2))
+      ->method('getDefaultInstanceSettings')
+      ->will($this->returnValue(array()));
+
+    $fields['id'] = FieldDefinition::create('string')
+      ->setName('id');
+    $fields['revision_id'] = FieldDefinition::create('string')
+      ->setName('revision_id');
+
+    $entity_manager->expects($this->any())
+      ->method('getDefinition')
+      ->with('test_entity')
+      ->will($this->returnValue($definition));
+    $entity_manager->expects($this->any())
+      ->method('getBaseFieldDefinitions')
+      ->with('test_entity')
+      ->will($this->returnValue($fields));
+
+    // Define a field definition for a test_field field.
+    $field = $this->getMock('\Drupal\field\FieldConfigInterface');
+    $field->deleted = FALSE;
+    $field->entity_type = 'test_entity';
+    $field->name = 'test_field';
+
+    $field->expects($this->any())
+      ->method('getName')
+      ->will($this->returnValue('test'));
+
+    $field_schema = array(
+      'columns' => array(
+        'value' => array(
+          'type' => 'varchar',
+          'length' => 10,
+          'not null' => FALSE,
+        ),
+      ),
+      'indexes' => array(),
+      'foreign keys' => array(),
+    );
+    $field->expects($this->any())
+      ->method('getSchema')
+      ->will($this->returnValue($field_schema));
+
+    $schema = ContentEntityDatabaseStorage::_fieldSqlSchema($field);
+
+    // Make sure that the entity_id schema field if of type varchar.
+    $this->assertEquals($schema['test_entity__test_field']['fields']['entity_id']['type'], 'varchar');
+    $this->assertEquals($schema['test_entity__test_field']['fields']['revision_id']['type'], 'varchar');
+  }
+
+}
diff --git a/core/tests/Drupal/Tests/Core/Entity/FieldableDatabaseEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/FieldableDatabaseEntityStorageTest.php
deleted file mode 100644
index 5170bd5..0000000
--- a/core/tests/Drupal/Tests/Core/Entity/FieldableDatabaseEntityStorageTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Tests\Core\Entity\ContentEntityDatabaseStorageTest.
- */
-
-namespace Drupal\Tests\Core\Entity;
-
-use Drupal\Core\Entity\EntityType;
-use Drupal\Core\Entity\ContentEntityDatabaseStorage;
-use Drupal\Core\Field\FieldDefinition;
-use Drupal\Tests\UnitTestCase;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-/**
- * Tests the fieldable database storage.
- *
- * @see \Drupal\Core\Entity\ContentEntityDatabaseStorage
- *
- * @group Drupal
- * @group Entity
- */
-class ContentEntityDatabaseStorageTest extends UnitTestCase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getInfo() {
-    return array(
-      'name' => 'Fieldable database storage',
-      'description' => 'Tests the fieldable database storage enhancer for entities.',
-      'group' => 'Entity'
-    );
-  }
-
-  /**
-   * Tests field SQL schema generation for an entity with a string identifier.
-   *
-   * @see \Drupal\Core\Entity\Controller\ContentEntityDatabaseStorage::_fieldSqlSchema()
-   */
-  public function testFieldSqlSchemaForEntityWithStringIdentifier() {
-    $field_type_manager = $this->getMock('Drupal\Core\Field\FieldTypePluginManagerInterface');
-    $entity_manager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
-
-    $container = new ContainerBuilder();
-    $container->set('plugin.manager.field.field_type', $field_type_manager);
-    $container->set('entity.manager', $entity_manager);
-    \Drupal::setContainer($container);
-
-    $definition = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
-    $definition->expects($this->any())
-      ->method('getKey')
-      ->will($this->returnValueMap(array(
-        array('id', 'id'),
-        array('revision_id', 'revision_id'),
-      )));
-    $definition->expects($this->once())
-      ->method('hasKey')
-      ->with('revision_id')
-      ->will($this->returnValue(TRUE));
-
-    $field_type_manager->expects($this->exactly(2))
-      ->method('getDefaultSettings')
-      ->will($this->returnValue(array()));
-    $field_type_manager->expects($this->exactly(2))
-      ->method('getDefaultInstanceSettings')
-      ->will($this->returnValue(array()));
-
-    $fields['id'] = FieldDefinition::create('string')
-      ->setName('id');
-    $fields['revision_id'] = FieldDefinition::create('string')
-      ->setName('revision_id');
-
-    $entity_manager->expects($this->any())
-      ->method('getDefinition')
-      ->with('test_entity')
-      ->will($this->returnValue($definition));
-    $entity_manager->expects($this->any())
-      ->method('getBaseFieldDefinitions')
-      ->with('test_entity')
-      ->will($this->returnValue($fields));
-
-    // Define a field definition for a test_field field.
-    $field = $this->getMock('\Drupal\field\FieldConfigInterface');
-    $field->deleted = FALSE;
-    $field->entity_type = 'test_entity';
-    $field->name = 'test_field';
-
-    $field->expects($this->any())
-      ->method('getName')
-      ->will($this->returnValue('test'));
-
-    $field_schema = array(
-      'columns' => array(
-        'value' => array(
-          'type' => 'varchar',
-          'length' => 10,
-          'not null' => FALSE,
-        ),
-      ),
-      'indexes' => array(),
-      'foreign keys' => array(),
-    );
-    $field->expects($this->any())
-      ->method('getSchema')
-      ->will($this->returnValue($field_schema));
-
-    $schema = ContentEntityDatabaseStorage::_fieldSqlSchema($field);
-
-    // Make sure that the entity_id schema field if of type varchar.
-    $this->assertEquals($schema['test_entity__test_field']['fields']['entity_id']['type'], 'varchar');
-    $this->assertEquals($schema['test_entity__test_field']['fields']['revision_id']['type'], 'varchar');
-  }
-
-}