tests/src/Functional/CommentTest.php | 4 +---
 tests/src/Functional/UserTest.php    | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/src/Functional/CommentTest.php b/tests/src/Functional/CommentTest.php
index 35cf1e6..ae525ff 100644
--- a/tests/src/Functional/CommentTest.php
+++ b/tests/src/Functional/CommentTest.php
@@ -319,9 +319,7 @@ class CommentTest extends ResourceTestBase {
     // @todo Remove the try/catch in https://www.drupal.org/node/2820364.
     try {
       $response = $this->request('POST', $url, $request_options);
-      if (floatval(\Drupal::VERSION) >= 8.7) {
-        $this->assertResourceErrorResponse(422, 'entity_id: This value should not be null.', NULL, $response, '/data/attributes/entity_id');
-      }
+      $this->assertResourceErrorResponse(422, 'entity_id: This value should not be null.', NULL, $response, '/data/attributes/entity_id');
     }
     catch (\Exception $e) {
       if (version_compare(phpversion(), '7.0') >= 0) {
diff --git a/tests/src/Functional/UserTest.php b/tests/src/Functional/UserTest.php
index 8b99779..0d5d6de 100644
--- a/tests/src/Functional/UserTest.php
+++ b/tests/src/Functional/UserTest.php
@@ -155,9 +155,7 @@ class UserTest extends ResourceTestBase {
   protected function getExpectedCacheContexts(array $sparse_fieldset = NULL) {
     $cache_contexts = parent::getExpectedCacheContexts($sparse_fieldset);
     if ($sparse_fieldset === NULL || in_array('mail', $sparse_fieldset)) {
-      if (floatval(\Drupal::VERSION) >= 8.7) {
-        $cache_contexts = Cache::mergeContexts($cache_contexts, ['user']);
-      }
+      $cache_contexts = Cache::mergeContexts($cache_contexts, ['user']);
     }
     return $cache_contexts;
   }