diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index f7acef60f..4ce4de450 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -26,6 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         redis_version:
+          - "8.4"
           - "8.2"
           - "8.0"
           - "7.4"
diff --git a/Makefile b/Makefile
index 964ab6b38..ab8d908ca 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ SHELL := /bin/bash
 PATH := ./work/redis-git/src:${PATH}
 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 PROFILE ?= ci
-SUPPORTED_TEST_ENV_VERSIONS := 8.2 8.0 7.4 7.2
+SUPPORTED_TEST_ENV_VERSIONS := 8.4 8.2 8.0 7.4 7.2
 DEFAULT_TEST_ENV_VERSION := 8.2
 REDIS_ENV_WORK_DIR := $(or ${REDIS_ENV_WORK_DIR},$(ROOT_DIR)/work)
 
diff --git a/src/test/resources/docker-env/.env.v8.4 b/src/test/resources/docker-env/.env.v8.4
new file mode 100644
index 000000000..f3ddb58a4
--- /dev/null
+++ b/src/test/resources/docker-env/.env.v8.4
@@ -0,0 +1,3 @@
+REDIS_ENV_WORK_DIR=../../../../work/docker
+REDIS_VERSION=8.4-M01-pre
+REDIS_STACK_VERSION=8.4-M01-pre