diff --git a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
index 5308bb132..6da6e48b7 100644
--- a/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/StreamCommandIntegrationTests.java
@@ -407,7 +407,9 @@ void xgroupCreate() {
 
     @Test
     @EnabledOnCommand("EVAL_RO") // Redis 7.0
-    void xgroupCreateEntriesRead() {
+    void xgroupCreateEntriesRead_pre822() {
+        assumeTrue(RedisConditions.of(redis).getRedisVersion().isLessThan(RedisConditions.Version.parse("8.2.2")),
+                "Redis 8.2.2+ has different behavior for entries-read");
 
         redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.entriesRead(5).mkstream(true));
 
@@ -416,6 +418,21 @@ void xgroupCreateEntriesRead() {
         assertThat(group.get(0)).containsSequence("entries-read", 5L, "lag");
     }
 
+    @Test
+    @EnabledOnCommand("EVAL_RO") // Redis 7.0
+    void xgroupCreateEntriesRead_post822() {
+        assumeTrue(RedisConditions.of(redis).hasVersionGreaterOrEqualsTo("8.2.2"),
+                "Redis 8.2.2+ has different behavior for entries-read");
+
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+        redis.xadd(key, Collections.singletonMap("key", "value"));
+        redis.xgroupCreate(StreamOffset.latest(key), "group", XGroupCreateArgs.Builder.entriesRead(5).mkstream(true));
+
+        List<List<Object>> group = (List) redis.xinfoGroups("key");
+
+        assertThat(group.get(0)).containsSequence("entries-read", 2L, "lag");
+    }
+
     @Test
     @EnabledOnCommand("XAUTOCLAIM") // Redis 6.2
     void xgroupCreateconsumer() {
diff --git a/src/test/resources/docker-env/.env b/src/test/resources/docker-env/.env
index 236dbca33..4b009a719 100644
--- a/src/test/resources/docker-env/.env
+++ b/src/test/resources/docker-env/.env
@@ -1,3 +1,3 @@
 REDIS_ENV_WORK_DIR=../../../../work/docker
-REDIS_VERSION=8.2.1-pre
-REDIS_STACK_VERSION=8.2.1-pre
+REDIS_VERSION=8.2.2
+REDIS_STACK_VERSION=8.2.2
diff --git a/src/test/resources/docker-env/docker-compose.yml b/src/test/resources/docker-env/docker-compose.yml
index 20a0132f6..a11495c96 100644
--- a/src/test/resources/docker-env/docker-compose.yml
+++ b/src/test/resources/docker-env/docker-compose.yml
@@ -1,7 +1,7 @@
 x-client-libs-image: &client-libs-image
-  image: "redislabs/client-libs-test:${REDIS_VERSION:-8.2.1pre}"
+  image: "redislabs/client-libs-test:${REDIS_VERSION:-8.2.2}"
 x-client-libs-stack-image: &client-libs-stack-image
-  image: "redislabs/client-libs-test:${REDIS_STACK_VERSION:-8.2.1-pre}"
+  image: "redislabs/client-libs-test:${REDIS_STACK_VERSION:-8.2.2}"
 
 services:
   # Standalone Redis Servers