diff -u b/core/modules/node/tests/src/Functional/AssertButtonsTrait.php b/core/modules/node/src/Tests/AssertButtonsTrait.php
--- b/core/modules/node/tests/src/Functional/AssertButtonsTrait.php
+++ b/core/modules/node/src/Tests/AssertButtonsTrait.php
@@ -1,9 +1,14 @@
 <?php
 
-namespace Drupal\Tests\node\Functional;
+namespace Drupal\node\Tests;
+
+@trigger_error('\Drupal\Tests\node\Functional\AssertButtonsTrait is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\node\Functional\AssertButtonsTrait', E_USER_DEPRECATED);
 
 /**
  * Asserts that buttons are present on a page.
+ *
+ * @deprecated Scheduled for removal before Drupal 9.0.0.
+ *   Use \Drupal\Tests\node\Functional\AssertButtonsTrait instead.
  */
 trait AssertButtonsTrait {
 
@@ -15,7 +20,7 @@
    * @param bool $dropbutton
    *   Whether to check if the buttons are in a dropbutton widget or not.
    */
-  public function assertButtons(array $buttons, $dropbutton = TRUE) {
+  public function assertButtons($buttons, $dropbutton = TRUE) {
 
     // Try to find a Save button.
     $save_button = $this->xpath('//input[@type="submit"][@value="Save"]');
@@ -30,11 +35,10 @@
       $this->assertTrue(empty($save_button));
 
       // Dropbutton elements.
-      /** @var \Behat\Mink\Element\NodeElement[] $elements */
       $elements = $this->xpath('//div[@class="dropbutton-wrapper"]//input[@type="submit"]');
       $this->assertEqual($count, count($elements));
       foreach ($elements as $element) {
-        $value = $element->getValue() ?: '';
+        $value = isset($element['value']) ? (string) $element['value'] : '';
         $this->assertEqual($buttons[$i], $value);
         $i++;
       }
diff -u b/core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php b/core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php
--- b/core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\node\Functional;
 
 use Drupal\simpletest\TestBase;
+use Drupal\Tests\Traits\Core\GeneratePermutationsTrait;
 
 /**
  * Tests user permissions for node revisions.
@@ -11,6 +12,8 @@
  */
 class NodeRevisionPermissionsTest extends NodeTestBase {
 
+  use GeneratePermutationsTrait;
+
   /**
    * The node revisions.
    *
@@ -146,7 +149,7 @@
     // permissions.
     $revision = $this->nodeRevisions['page'][1];
 
-    $permutations = TestBase::generatePermutations($parameters);
+    $permutations = $this->generatePermutations($parameters);
     $node_revision_access = \Drupal::service('access_check.node.revision');
     foreach ($permutations as $case) {
       // Skip this test if there are no revisions for the node.
diff -u b/core/modules/node/tests/src/Functional/Views/NodeTestBase.php b/core/modules/node/src/Tests/Views/NodeTestBase.php
--- b/core/modules/node/tests/src/Functional/Views/NodeTestBase.php
+++ b/core/modules/node/src/Tests/Views/NodeTestBase.php
@@ -1,23 +1,27 @@
 <?php
 
-namespace Drupal\Tests\node\Functional\Views;
+namespace Drupal\node\Tests\Views;
 
-use Drupal\Tests\views\Functional\ViewTestBase;
+@trigger_error('\Drupal\node\Tests\Views\NodeTestBase is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, use \Drupal\Tests\node\Functional\Views\NodeTestBase', E_USER_DEPRECATED);
+
+use Drupal\views\Tests\ViewTestBase;
 use Drupal\views\Tests\ViewTestData;
 
 /**
- * Base class for all node Views tests.
+ * Base class for all node tests.
+ *
+ * @deprecated Scheduled for removal before Drupal 9.0.0.
+ *   Use \Drupal\Tests\node\Functional\Views\NodeTestBase instead.
  */
 abstract class NodeTestBase extends ViewTestBase {
 
   /**
-   * {@inheritdoc}
+   * Modules to enable.
+   *
+   * @var array
    */
   public static $modules = ['node_test_views'];
 
-  /**
-   * {@inheritdoc}
-   */
   protected function setUp($import_test_views = TRUE) {
     parent::setUp($import_test_views);