tests/src/Functional/BlockContentTest.php | 11 +++--------
 tests/src/Functional/CommentTest.php      | 11 +++--------
 tests/src/Functional/TermTest.php         | 12 +++---------
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/tests/src/Functional/BlockContentTest.php b/tests/src/Functional/BlockContentTest.php
index d4d7c52..a368452 100644
--- a/tests/src/Functional/BlockContentTest.php
+++ b/tests/src/Functional/BlockContentTest.php
@@ -4,6 +4,7 @@ namespace Drupal\Tests\jsonapi\Functional;
 
 use Drupal\block_content\Entity\BlockContent;
 use Drupal\block_content\Entity\BlockContentType;
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\Url;
 use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
 
@@ -185,25 +186,19 @@ class BlockContentTest extends ResourceTestBase {
       ->addCacheTags(['block_content:1']);
   }
 
-  // @codingStandardsIgnoreStart
   /**
    * {@inheritdoc}
    */
   protected function getExpectedCacheTags() {
-    // @todo Uncomment first line, remove second line in https://www.drupal.org/project/jsonapi/issues/2940342.
-//    return Cache::mergeTags(parent::getExpectedCacheTags(), ['config:filter.format.plain_text']);
-    return parent::getExpectedCacheTags();
+    return Cache::mergeTags(parent::getExpectedCacheTags(), ['config:filter.format.plain_text']);
   }
 
   /**
    * {@inheritdoc}
    */
   protected function getExpectedCacheContexts() {
-    // @todo Uncomment first line, remove second line in https://www.drupal.org/project/jsonapi/issues/2940342.
-//    return Cache::mergeContexts(['url.site'], $this->container->getParameter('renderer.config')['required_cache_contexts']);
-    return parent::getExpectedCacheContexts();
+    return Cache::mergeContexts(parent::getExpectedCacheContexts(), ['languages:language_interface', 'theme']);
   }
-  // @codingStandardsIgnoreEnd
 
   /**
    * {@inheritdoc}
diff --git a/tests/src/Functional/CommentTest.php b/tests/src/Functional/CommentTest.php
index c4d3d18..5821588 100644
--- a/tests/src/Functional/CommentTest.php
+++ b/tests/src/Functional/CommentTest.php
@@ -7,6 +7,7 @@ use Drupal\comment\Entity\CommentType;
 use Drupal\comment\Tests\CommentTestTrait;
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\Url;
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
@@ -248,25 +249,19 @@ class CommentTest extends ResourceTestBase {
     ];
   }
 
-  // @codingStandardsIgnoreStart
   /**
    * {@inheritdoc}
    */
   protected function getExpectedCacheTags() {
-    // @todo Uncomment first line, remove second line in https://www.drupal.org/project/jsonapi/issues/2940342.
-//    return Cache::mergeTags(parent::getExpectedCacheTags(), ['config:filter.format.plain_text']);
-    return parent::getExpectedCacheTags();
+    return Cache::mergeTags(parent::getExpectedCacheTags(), ['config:filter.format.plain_text']);
   }
 
   /**
    * {@inheritdoc}
    */
   protected function getExpectedCacheContexts() {
-    // @todo Uncomment first line, remove second line in https://www.drupal.org/project/jsonapi/issues/2940342.
-//    return Cache::mergeContexts(['languages:language_interface', 'theme'], parent::getExpectedCacheContexts());
-    return parent::getExpectedCacheContexts();
+    return Cache::mergeContexts(['languages:language_interface', 'theme'], parent::getExpectedCacheContexts());
   }
-  // @codingStandardsIgnoreEnd
 
   /**
    * {@inheritdoc}
diff --git a/tests/src/Functional/TermTest.php b/tests/src/Functional/TermTest.php
index a371854..c79dc6f 100644
--- a/tests/src/Functional/TermTest.php
+++ b/tests/src/Functional/TermTest.php
@@ -4,6 +4,7 @@ namespace Drupal\Tests\jsonapi\Functional;
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\Url;
 use Drupal\taxonomy\Entity\Term;
 use Drupal\taxonomy\Entity\Vocabulary;
@@ -336,27 +337,20 @@ class TermTest extends ResourceTestBase {
     $this->assertSame($normalization['data']['attributes']['path']['alias'], $updated_normalization['data']['attributes']['path']['alias']);
   }
 
-  // @codingStandardsIgnoreStart
   /**
    * {@inheritdoc}
    */
   protected function getExpectedCacheTags() {
-    // @todo Uncomment first line, remove second line in https://www.drupal.org/project/jsonapi/issues/2940342.
-//    return Cache::mergeTags(parent::getExpectedCacheTags(), ['config:filter.format.plain_text', 'config:filter.settings']);
-    return parent::getExpectedCacheTags();
+    return Cache::mergeTags(parent::getExpectedCacheTags(), ['config:filter.format.plain_text', 'config:filter.settings']);
   }
 
   /**
    * {@inheritdoc}
    */
   protected function getExpectedCacheContexts() {
-    // @todo Uncomment first line, remove second line in https://www.drupal.org/project/jsonapi/issues/2940342.
-//    return Cache::mergeContexts(['url.site'], $this->container->getParameter('renderer.config')['required_cache_contexts']);
-    return parent::getExpectedCacheContexts();
+    return Cache::mergeContexts(parent::getExpectedCacheContexts(), ['languages:language_interface', 'theme']);
   }
 
-  // @codingStandardsIgnoreEnd
-
   /**
    * Tests GETting a term with a parent term other than the default <root> (0).
    *