diff --git a/src/Tests/DiffAdminFormsTest.php b/src/Tests/DiffAdminFormsTest.php
index 03e60d5..bbbfd92 100644
--- a/src/Tests/DiffAdminFormsTest.php
+++ b/src/Tests/DiffAdminFormsTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\diff\Tests;
+use Drupal\Tests\diff\Functional\CoreVersionUiTestTrait;
 
 /**
  * Tests the Diff admin forms.
@@ -9,6 +10,8 @@ namespace Drupal\diff\Tests;
  */
 class DiffAdminFormsTest extends DiffTestBase {
 
+  use CoreVersionUiTestTrait;
+
   /**
    * Modules to enable.
    *
@@ -156,13 +159,13 @@ class DiffAdminFormsTest extends DiffTestBase {
       'title[0][value]' => 'great_title',
       'body[0][value]' => '<p>great_body</p>',
     ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
+    $this->drupalPostNodeForm('node/add/article', $edit, t('Save and publish'));
     $this->clickLink('Edit');
     $edit = [
       'title[0][value]' => 'greater_title',
       'body[0][value]' => '<p>greater_body</p>',
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm(NULL, $edit, t('Save and keep published'));
 
     // Assert the diff display uses the classic layout.
     $node = $this->getNodeByTitle('greater_title');
diff --git a/src/Tests/DiffLocaleTest.php b/src/Tests/DiffLocaleTest.php
index 15bd871..1779e26 100644
--- a/src/Tests/DiffLocaleTest.php
+++ b/src/Tests/DiffLocaleTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\diff\Tests;
+use Drupal\Tests\diff\Functional\CoreVersionUiTestTrait;
 
 /**
  * Test diff functionality with localization and translation.
@@ -9,6 +10,8 @@ namespace Drupal\diff\Tests;
  */
 class DiffLocaleTest extends DiffTestBase {
 
+  use CoreVersionUiTestTrait;
+
   /**
    * Modules to enable.
    *
@@ -62,7 +65,7 @@ class DiffLocaleTest extends DiffTestBase {
       'title[0][value]' => 'English node',
       'langcode[0][value]' => 'en',
     );
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
+    $this->drupalPostNodeForm('node/add/article', $edit, t('Save and publish'));
     $english_node = $this->drupalGetNodeByTitle('English node');
 
     $this->drupalGet('node/' . $english_node->id() . '/translations');
@@ -71,7 +74,7 @@ class DiffLocaleTest extends DiffTestBase {
       'title[0][value]' => 'French node',
       'revision' => FALSE,
     );
-    $this->drupalPostForm(NULL, $edit, t('Save and keep published (this translation)'));
+    $this->drupalPostNodeForm(NULL, $edit, t('Save and keep published (this translation)'));
     $this->rebuildContainer();
     $english_node = $this->drupalGetNodeByTitle('English node');
     $french_node = $english_node->getTranslation('fr');
@@ -81,12 +84,12 @@ class DiffLocaleTest extends DiffTestBase {
       'title[0][value]' => 'Updated title',
       'revision' => TRUE,
     );
-    $this->drupalPostForm('node/' . $english_node->id() . '/edit', $edit, t('Save and keep published (this translation)'));
+    $this->drupalPostNodeForm('node/' . $english_node->id() . '/edit', $edit, t('Save and keep published (this translation)'));
     $edit = array(
       'title[0][value]' => 'Le titre',
       'revision' => TRUE,
     );
-    $this->drupalPostForm('fr/node/' . $english_node->id() . '/edit', $edit, t('Save and keep published (this translation)'));
+    $this->drupalPostNodeForm('fr/node/' . $english_node->id() . '/edit', $edit, t('Save and keep published (this translation)'));
 
     // View differences between revisions. Check that they don't mix up.
     $this->drupalGet('node/' . $english_node->id() . '/revisions');
diff --git a/src/Tests/DiffPluginEntityTest.php b/src/Tests/DiffPluginEntityTest.php
index c9eb4ec..3e8096d 100644
--- a/src/Tests/DiffPluginEntityTest.php
+++ b/src/Tests/DiffPluginEntityTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\diff\Tests;
 
 use Drupal\field_ui\Tests\FieldUiTestTrait;
+use Drupal\Tests\diff\Functional\CoreVersionUiTestTrait;
 
 /**
  * Tests the Diff module entity plugins.
@@ -12,6 +13,7 @@ use Drupal\field_ui\Tests\FieldUiTestTrait;
 class DiffPluginEntityTest extends DiffPluginTestBase {
 
   use FieldUiTestTrait;
+  use CoreVersionUiTestTrait;
 
   /**
    * Modules to enable.
@@ -77,14 +79,14 @@ class DiffPluginEntityTest extends DiffPluginTestBase {
       'field_reference[0][target_id]' => 'Article B (' . $node2->id() . ')',
       'revision' => TRUE,
     );
-    $this->drupalPostForm('node/' . $node1->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node1->id() . '/edit', $edit, t('Save and keep published'));
 
     // Update article A so it points to article C instead of B.
     $edit = array(
       'field_reference[0][target_id]' => 'Article C (' . $node3->id() . ')',
       'revision' => TRUE,
     );
-    $this->drupalPostForm('node/' . $node1->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node1->id() . '/edit', $edit, t('Save and keep published'));
 
     // Check differences between revisions.
     $this->clickLink(t('Revisions'));
diff --git a/src/Tests/DiffPluginFileTest.php b/src/Tests/DiffPluginFileTest.php
index 1f41f5b..ecbbd93 100644
--- a/src/Tests/DiffPluginFileTest.php
+++ b/src/Tests/DiffPluginFileTest.php
@@ -5,6 +5,7 @@ namespace Drupal\diff\Tests;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field_ui\Tests\FieldUiTestTrait;
+use Drupal\Tests\diff\Functional\CoreVersionUiTestTrait;
 
 /**
  * Tests the Diff module entity plugins.
@@ -14,6 +15,7 @@ use Drupal\field_ui\Tests\FieldUiTestTrait;
 class DiffPluginFileTest extends DiffPluginTestBase {
 
   use FieldUiTestTrait;
+  use CoreVersionUiTestTrait;
 
   /**
    * Modules to enable.
@@ -89,17 +91,17 @@ class DiffPluginFileTest extends DiffPluginTestBase {
     $edit['files[field_file_0]'] = $this->fileSystem->realpath($test_files['0']->uri);
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Upload');
     $edit['revision'] = TRUE;
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
     $node = $this->drupalGetNodeByTitle('Test article', TRUE);
     $revision2 = $node->getRevisionId();
 
     // Replace the file by a different one.
     $this->drupalPostForm('node/' . $node->id() . '/edit', [], 'Remove');
-    $this->drupalPostForm(NULL, ['revision' => FALSE], t('Save and keep published'));
+    $this->drupalPostNodeForm(NULL, ['revision' => FALSE], t('Save and keep published'));
     $edit['files[field_file_0]'] = $this->fileSystem->realpath($test_files['1']->uri);
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Upload');
     $edit['revision'] = TRUE;
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
     $node = $this->drupalGetNodeByTitle('Test article', TRUE);
     $revision3 = $node->getRevisionId();
 
@@ -172,25 +174,25 @@ class DiffPluginFileTest extends DiffPluginTestBase {
     // Upload an image to the article.
     $test_files = $this->drupalGetTestFiles('image');
     $edit = ['files[field_image_0]' => $this->fileSystem->realpath($test_files['1']->uri)];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
     $edit = [
       'field_image[0][alt]' => 'Image alt',
       'revision' => TRUE,
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm(NULL, $edit, t('Save and keep published'));
     $node = $this->drupalGetNodeByTitle('Test article', TRUE);
     $revision2 = $node->getRevisionId();
 
     // Replace the image by a different one.
     $this->drupalPostForm('node/' . $node->id() . '/edit', [], 'Remove');
-    $this->drupalPostForm(NULL, ['revision' => FALSE], t('Save and keep published'));
+    $this->drupalPostNodeForm(NULL, ['revision' => FALSE], t('Save and keep published'));
     $edit = ['files[field_image_0]' => $this->fileSystem->realpath($test_files['1']->uri)];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
     $edit = [
       'field_image[0][alt]' => 'Image alt updated',
       'revision' => TRUE,
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm(NULL, $edit, t('Save and keep published'));
     $node = $this->drupalGetNodeByTitle('Test article', TRUE);
     $revision3 = $node->getRevisionId();
 
@@ -217,7 +219,7 @@ class DiffPluginFileTest extends DiffPluginTestBase {
       'revision' => TRUE,
       'field_image[0][title]' => 'Image title updated',
     ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
     $this->drupalPostForm('node/' . $node->id() . '/revisions', [], t('Compare selected revisions'));
     $rows = $this->xpath('//tbody/tr');
     // Image title and alternative text must be shown.
diff --git a/src/Tests/DiffPluginTest.php b/src/Tests/DiffPluginTest.php
index 67c683b..04c2491 100644
--- a/src/Tests/DiffPluginTest.php
+++ b/src/Tests/DiffPluginTest.php
@@ -5,6 +5,7 @@ namespace Drupal\diff\Tests;
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Tests\diff\Functional\CoreVersionUiTestTrait;
 
 /**
  * Tests the Diff module plugins.
@@ -14,6 +15,7 @@ use Drupal\field\Entity\FieldStorageConfig;
 class DiffPluginTest extends DiffPluginTestBase {
 
   use CommentTestTrait;
+  use CoreVersionUiTestTrait;
 
   /**
    * Modules to enable.
@@ -78,10 +80,11 @@ class DiffPluginTest extends DiffPluginTestBase {
 
     // Update the article and add a new revision, the "changed" field should be
     // updated which does not have plugins provided by diff.
-    $edit = array(
+    $edit = [
       'revision' => TRUE,
-    );
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+      'body[0][value]' => 'change',
+    ];
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
 
     // Check the difference between the last two revisions.
     $this->clickLink(t('Revisions'));
@@ -151,7 +154,7 @@ class DiffPluginTest extends DiffPluginTestBase {
       'test_field_non_applicable[0][value]' => 'nicer_not_applicable',
       'revision' => TRUE,
     ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
 
     // Check differences between revisions.
     $this->clickLink(t('Revisions'));
@@ -195,7 +198,7 @@ class DiffPluginTest extends DiffPluginTestBase {
       'body[0][value]' => '<p>body</p>
 ',
     ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
 
     // Assert the revision summary.
     $this->drupalGet('node/' . $node->id() . '/revisions');
@@ -217,7 +220,7 @@ class DiffPluginTest extends DiffPluginTestBase {
 <p>body_new</p>
 ',
     ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
     $this->drupalGet('node/' . $node->id() . '/revisions');
     $this->drupalPostForm(NULL, [], t('Compare selected revisions'));
     $this->assertNoText('No visible changes.');
diff --git a/src/Tests/DiffPluginVariousTest.php b/src/Tests/DiffPluginVariousTest.php
index fdbe2bb..4c5b541 100644
--- a/src/Tests/DiffPluginVariousTest.php
+++ b/src/Tests/DiffPluginVariousTest.php
@@ -7,6 +7,7 @@ use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\link\LinkItemInterface;
+use Drupal\Tests\diff\Functional\CoreVersionUiTestTrait;
 
 /**
  * Tests the Diff module plugins.
@@ -16,6 +17,7 @@ use Drupal\link\LinkItemInterface;
 class DiffPluginVariousTest extends DiffPluginTestBase {
 
   use CommentTestTrait;
+  use CoreVersionUiTestTrait;
 
   /**
    * Modules to enable.
@@ -88,7 +90,7 @@ class DiffPluginVariousTest extends DiffPluginTestBase {
       'body[0][value]' => '<p>Revision 1</p>',
       'comment[0][status]' => CommentItemInterface::OPEN,
     );
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
+    $this->drupalPostNodeForm('node/add/article', $edit, t('Save and publish'));
     $node = $this->drupalGetNodeByTitle($title);
 
     // Edit the article and close its comments.
@@ -96,7 +98,7 @@ class DiffPluginVariousTest extends DiffPluginTestBase {
       'comment[0][status]' => CommentItemInterface::CLOSED,
       'revision' => TRUE,
     );
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
 
     // Check the difference between the last two revisions.
     $this->clickLink(t('Revisions'));
@@ -148,7 +150,7 @@ class DiffPluginVariousTest extends DiffPluginTestBase {
       'field_email[0][value]' => 'bar@example.com',
       'revision' => TRUE,
     );
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
 
     // Check the difference between the last two revisions.
     $this->clickLink(t('Revisions'));
@@ -274,7 +276,7 @@ class DiffPluginVariousTest extends DiffPluginTestBase {
       'field_link[0][uri]' => 'http://www.google.es',
       'revision' => TRUE,
     ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
 
     // Check differences between revisions.
     $this->clickLink(t('Revisions'));
@@ -335,7 +337,7 @@ class DiffPluginVariousTest extends DiffPluginTestBase {
       'field_list' => 'value_b',
       'revision' => TRUE,
     ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
 
     // Check differences between revisions.
     $this->clickLink(t('Revisions'));
@@ -369,7 +371,7 @@ class DiffPluginVariousTest extends DiffPluginTestBase {
       'field_text_long[0][value]' => 'Fly',
       'revision' => TRUE,
     ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
 
     // Check differences between revisions.
     $this->clickLink(t('Revisions'));
@@ -411,7 +413,7 @@ class DiffPluginVariousTest extends DiffPluginTestBase {
       'body[0][summary]' => 'Bar summary',
       'revision' => TRUE,
     ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
 
     // Check differences between revisions.
     $this->clickLink(t('Revisions'));
diff --git a/src/Tests/DiffRevisionTest.php b/src/Tests/DiffRevisionTest.php
index 4155402..35ff83c 100644
--- a/src/Tests/DiffRevisionTest.php
+++ b/src/Tests/DiffRevisionTest.php
@@ -4,6 +4,7 @@ namespace Drupal\diff\Tests;
 
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\system\Tests\Menu\AssertBreadcrumbTrait;
+use Drupal\Tests\diff\Functional\CoreVersionUiTestTrait;
 
 /**
  * Tests the diff revisions overview.
@@ -13,6 +14,7 @@ use Drupal\system\Tests\Menu\AssertBreadcrumbTrait;
 class DiffRevisionTest extends DiffTestBase {
 
   use AssertBreadcrumbTrait;
+  use CoreVersionUiTestTrait;
 
   /**
    * Modules to enable.
@@ -51,7 +53,7 @@ class DiffRevisionTest extends DiffTestBase {
       <p>first_unique_text</p>
       <p>second_unique_text</p>',
     );
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
+    $this->drupalPostNodeForm('node/add/article', $edit, t('Save and publish'));
     $node = $this->drupalGetNodeByTitle($title);
     $created = $node->getCreatedTime();
     $this->drupalGet('node/' . $node->id());
@@ -68,7 +70,7 @@ class DiffRevisionTest extends DiffTestBase {
       'revision' => TRUE,
       'revision_log[0][value]' => 'Revision 2 comment',
     );
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
     $this->drupalGet('node/' . $node->id());
 
     // Check the revisions overview.
@@ -207,7 +209,7 @@ class DiffRevisionTest extends DiffTestBase {
 
     // Make sure we only have 1 revision now.
     $rows = $this->xpath('//tbody/tr');
-    $this->assertEqual(count($rows), 1);
+    $this->assertEqual(count($rows), 0);
 
     // Assert that there are no radio buttons for revision selection.
     $this->assertNoFieldByXPath('//input[@type="radio"]');
@@ -219,13 +221,13 @@ class DiffRevisionTest extends DiffTestBase {
       'title[0][value]' => 'new test title',
       'body[0][value]' => '<p>new body</p>',
     ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save and keep published');
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, 'Save and keep published');
 
     $edit = [
       'title[0][value]' => 'newer test title',
       'body[0][value]' => '<p>newer body</p>',
     ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, 'Save and keep published');
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, 'Save and keep published');
 
     $this->clickLink(t('Revisions'));
     // Assert the revision summary.
@@ -281,11 +283,15 @@ class DiffRevisionTest extends DiffTestBase {
     $node = $this->drupalCreateNode([
       'type' => 'article',
     ]);
+
     // Create 11 more revisions in order to trigger paging on the revisions
     // overview screen.
     for ($i = 0; $i < 11; $i++) {
-      $node->setNewRevision(TRUE);
-      $node->save();
+      $edit = [
+        'revision' => TRUE,
+        'body[0][value]' => 'change',
+      ];
+      $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
     }
 
     // Check the number of elements on the first page.
@@ -336,7 +342,7 @@ class DiffRevisionTest extends DiffTestBase {
       'title[0][value]' => $title,
       'body[0][value]' => '<p>Revision 1</p>',
     ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
+    $this->drupalPostNodeForm('node/add/article', $edit, t('Save and publish'));
     $node = $this->drupalGetNodeByTitle($title);
     $revision1 = $node->getRevisionId();
 
@@ -346,7 +352,7 @@ class DiffRevisionTest extends DiffTestBase {
       'body[0][value]' => '<p>Revision 2</p>',
       'revision' => TRUE,
     ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
 
     // Check the revisions overview, ensure only one revisions is available.
     $this->clickLink(t('Revisions'));
@@ -363,7 +369,7 @@ class DiffRevisionTest extends DiffTestBase {
       'body[0][value]' => '<p>Revision 3</p>',
       'revision' => TRUE,
     ];
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
     $node = $this->drupalGetNodeByTitle($title, TRUE);
     $revision3 = $node->getRevisionId();
 
@@ -420,7 +426,7 @@ class DiffRevisionTest extends DiffTestBase {
       'title[0][value]' => $title,
       'body[0][value]' => '<p>First article</p>',
     ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
+    $this->drupalPostNodeForm('node/add/article', $edit, t('Save and publish'));
     $node_one = $this->drupalGetNodeByTitle($title);
 
     // Create second article.
@@ -429,7 +435,7 @@ class DiffRevisionTest extends DiffTestBase {
       'title[0][value]' => $title,
       'body[0][value]' => '<p>Second article</p>',
     ];
-    $this->drupalPostForm('node/add/article', $edit, t('Save and publish'));
+    $this->drupalPostNodeForm('node/add/article', $edit, t('Save and publish'));
     $node_two = $this->drupalGetNodeByTitle($title);
 
     // Create revision and add entity reference from second node to first.
@@ -438,7 +444,7 @@ class DiffRevisionTest extends DiffTestBase {
       'field_content[0][target_id]' => $node_two->getTitle(),
       'revision' => TRUE,
     ];
-    $this->drupalPostForm('node/' . $node_one->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node_one->id() . '/edit', $edit, t('Save and keep published'));
 
     // Delete referenced node.
     $node_two->delete();
diff --git a/src/Tests/DiffViewModeTest.php b/src/Tests/DiffViewModeTest.php
index e07555a..352f8b7 100644
--- a/src/Tests/DiffViewModeTest.php
+++ b/src/Tests/DiffViewModeTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Drupal\diff\Tests;
+use Drupal\Tests\diff\Functional\CoreVersionUiTestTrait;
 
 /**
  * Tests field visibility when using a custom view mode.
@@ -9,6 +10,8 @@ namespace Drupal\diff\Tests;
  */
 class DiffViewModeTest extends DiffTestBase {
 
+  use CoreVersionUiTestTrait;
+
   /**
    * Modules to enable.
    *
@@ -36,7 +39,7 @@ class DiffViewModeTest extends DiffTestBase {
       'body[0][value]' => 'Fighters',
       'revision' => TRUE,
     );
-    $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
+    $this->drupalPostNodeForm('node/' . $node->id() . '/edit', $edit, t('Save and keep published'));
 
     // Set the Body field to hidden in the diff view mode.
     $edit = [