diff --git a/redis/build_msys2.sh b/redis/build_msys2.sh
index f7ecd070f..45dec0466 100755
--- a/redis/build_msys2.sh
+++ b/redis/build_msys2.sh
@@ -24,7 +24,7 @@ echo "::group::build"
 
 sed -i 's/__GNU_VISIBLE/1/' /d/a/_temp/msys64/usr/include/dlfcn.h
 
-make BUILD_TLS=yes CFLAGS=-Wno-char-subscripts
+make BUILD_TLS=yes CFLAGS="-Wno-char-subscripts -O0"
 
 echo "::endgroup::"
 
diff --git a/redis/test_linux.sh b/redis/test_linux.sh
index 5220de235..c624c8a46 100755
--- a/redis/test_linux.sh
+++ b/redis/test_linux.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
 
 testVersion() {
-  assertEquals "redis-cli 7.2.3" "$(../bin/redis-cli --version)"
+  assertEquals "redis-cli 7.2.3" "$(../bin/redis-cli --version | head -c 15)"
+}
+
+testServerVersion() {
+  assertEquals "Redis server v=7.2.3" "$(../bin/redis-server --version | head -c 20)"
 }
 
 # Load and run shUnit2.
diff --git a/redis/test_windows.sh b/redis/test_windows.sh
index 0433c20a7..dec9fb686 100644
--- a/redis/test_windows.sh
+++ b/redis/test_windows.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
 
 testVersion() {
-  assertEquals "redis-cli 7.2.3" "$(../bin/redis-cli.exe --version)"
+  assertEquals "redis-cli 7.2.3" "$(../bin/redis-cli.exe --version | head -c 15)"
+}
+
+testServerVersion() {
+  assertEquals "Redis server v=7.2.3" "$(../bin/redis-server.exe --version | head -c 20)"
 }
 
 # Load and run shUnit2.