diff --git a/Makefile b/Makefile
index fd4f99053..08577f7b4 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@
 
 REDIS_VERSION:=5.0.0
 SPRING_PROFILE?=ci
+SHELL=/bin/bash -euo pipefail
 
 #######
 # Redis
@@ -149,5 +150,5 @@ stop: redis-stop sentinel-stop cluster-stop
 test:
 	$(MAKE) start
 	sleep 2
-	./mvnw clean test -DrunLongTests=true -P$(SPRING_PROFILE)
+	set -euo pipefail ; ./mvnw clean test -DrunLongTests=true -P$(SPRING_PROFILE)
 	$(MAKE) stop
diff --git a/ci/test.sh b/ci/test.sh
index 6b0a8fe0d..ffaa2114d 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -euo pipefail
 
@@ -8,7 +8,7 @@ rm -rf $HOME/.m2/repository/org/springframework/data/redis 2> /dev/null || :
 
 cd spring-data-redis-github
 
-ln -s /work  x
+ln -sf /work
 
 # Maven run from inside Makefile to interact with Redis server.
 make test SPRING_PROFILE=spring5-next