diff --git a/tests/src/Functional/ResourceResponseTestTrait.php b/tests/src/Functional/ResourceResponseTestTrait.php
index 0452e4c..57dde1c 100644
--- a/tests/src/Functional/ResourceResponseTestTrait.php
+++ b/tests/src/Functional/ResourceResponseTestTrait.php
@@ -525,9 +525,18 @@ trait ResourceResponseTestTrait {
    *   The empty collection ResourceResponse.
    */
   protected function getEmptyCollectionResponse($cardinality, $self_link) {
-    $cacheability = (new CacheableMetadata())
-      ->addCacheContexts($this->getExpectedCacheContexts())
-      ->addCacheTags(['http_response']);
+    // If the entity type is revisionable, add a resource version cache context.
+    $cache_contexts = Cache::mergeContexts([
+      // Cache contexts for JSON API URL query parameters.
+      'url.query_args:fields',
+      'url.query_args:filter',
+      'url.query_args:include',
+      'url.query_args:page',
+      'url.query_args:sort',
+      // Drupal defaults.
+      'url.site',
+    ], $this->entity->getEntityType()->isRevisionable() ? ['url.query_args:resource_version'] : []);
+    $cacheability = (new CacheableMetadata())->addCacheContexts($cache_contexts)->addCacheTags(['http_response']);
     return (new ResourceResponse([
       // Empty to-one relationships should be NULL and empty to-many
       // relationships should be an empty array.
diff --git a/tests/src/Functional/ResourceTestBase.php b/tests/src/Functional/ResourceTestBase.php
index b63007d..90579a7 100644
--- a/tests/src/Functional/ResourceTestBase.php
+++ b/tests/src/Functional/ResourceTestBase.php
@@ -2907,7 +2907,7 @@ abstract class ResourceTestBase extends BrowserTestBase {
       [
         $original_revision_id,
         $original_revision_id_relationship_url,
-        $original_revision_id_related_url
+        $original_revision_id_related_url,
       ],
       [
         $latest_revision_id,