diff --git a/core/modules/field/lib/Drupal/field/Tests/FormTest.php b/core/modules/field/lib/Drupal/field/Tests/FormTest.php
index a2db4ad..74c3471 100644
--- a/core/modules/field/lib/Drupal/field/Tests/FormTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/FormTest.php
@@ -566,13 +566,14 @@ function testNestedFieldForm() {
 
     // Create two entities.
     $entity_type = 'entity_test';
-    $entity_1 = entity_create($entity_type, array('id' => 1, 'revision_id' => 1));
+    $entity_1 = entity_create($entity_type, array('id' => 1));
     $entity_1->enforceIsNew();
     $entity_1->field_single->value = 0;
     $entity_1->field_unlimited->value = 1;
     $entity_1->save();
 
-    $entity_2 = entity_create($entity_type, array('id' => 2, 'revision_id' => 2));
+    $entity_2 = entity_create($entity_type, array('id' => 2));
+    $entity_2->enforceIsNew();
     $entity_2->field_single->value = 10;
     $entity_2->field_unlimited->value = 11;
     $entity_2->save();
@@ -595,8 +596,8 @@ function testNestedFieldForm() {
     );
     $this->drupalPost(NULL, $edit, t('Save'));
     field_cache_clear();
-    $entity_1 = entity_create($entity_type, array('id' => 1));
-    $entity_2 = entity_create($entity_type, array('id' => 2));
+    $entity_1 = entity_load($entity_type, 1);
+    $entity_2 = entity_load($entity_type, 2);
     $this->assertFieldValues($entity_1, 'field_single', Language::LANGCODE_NOT_SPECIFIED, array(1));
     $this->assertFieldValues($entity_1, 'field_unlimited', Language::LANGCODE_NOT_SPECIFIED, array(2, 3));
     $this->assertFieldValues($entity_2, 'field_single', Language::LANGCODE_NOT_SPECIFIED, array(11));
diff --git a/core/modules/field/tests/modules/field_test/field_test.entity.inc b/core/modules/field/tests/modules/field_test/field_test.entity.inc
index e7d7d93..4cea03a 100644
--- a/core/modules/field/tests/modules/field_test/field_test.entity.inc
+++ b/core/modules/field/tests/modules/field_test/field_test.entity.inc
@@ -46,7 +46,7 @@ function field_test_entity_info_translatable($entity_type = NULL, $translatable
  */
 function field_test_entity_nested_form($form, &$form_state, $entity_1, $entity_2) {
   // First entity.
-  foreach (array('id', 'revision_id', 'type') as $key) {
+  foreach (array('id', 'type') as $key) {
     $form[$key] = array(
       '#type' => 'value',
       '#value' => $entity_1->$key->value,
@@ -63,7 +63,7 @@ function field_test_entity_nested_form($form, &$form_state, $entity_1, $entity_2
     '#parents' => array('entity_2'),
     '#weight' => 50,
   );
-  foreach (array('id', 'revision_id', 'type') as $key) {
+  foreach (array('id', 'type') as $key) {
     $form['entity_2'][$key] = array(
       '#type' => 'value',
       '#value' => $entity_2->$key->value,
@@ -100,11 +100,11 @@ function field_test_entity_nested_form_validate($form, &$form_state) {
 function field_test_entity_nested_form_submit($form, &$form_state) {
   $entity_1 = entity_create('entity_test', $form_state['values']);
   field_attach_extract_form_values($entity_1, $form, $form_state);
-  field_test_entity_save($entity_1);
+  $entity_1->save();
 
   $entity_2 = entity_create('entity_test', $form_state['values']['entity_2']);
   field_attach_extract_form_values($entity_2, $form['entity_2'], $form_state);
-  field_test_entity_save($entity_2);
+  $entity_2->save();
 
   drupal_set_message(t('test_entities @id_1 and @id_2 have been updated.', array('@id_1' => $entity_1->id(), '@id_2' => $entity_2->id())));
 }