diff --git a/Makefile b/Makefile
index 40eab733f..615c3aabc 100644
--- a/Makefile
+++ b/Makefile
@@ -147,8 +147,9 @@ stop-%: work/redis/bin/redis-cli
 
 stop: redis-stop sentinel-stop cluster-stop
 
-test:
+test_start:
 	$(MAKE) start
 	sleep 2
-	./mvnw clean test -U -DrunLongTests=true -P$(SPRING_PROFILE) || (echo "maven failed $$?"; exit 1)
+
+test_stop:
 	$(MAKE) stop
diff --git a/ci/test.sh b/ci/test.sh
index ffaa2114d..b611576f9 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -10,5 +10,10 @@ cd spring-data-redis-github
 
 ln -sf /work
 
-# Maven run from inside Makefile to interact with Redis server.
-make test SPRING_PROFILE=spring5-next
+# Launch Redis in proper configuration
+make test_start
+
+./mvnw -U clean test -DrunLongTests=true -Pspring5-next
+
+# Shutdown Redis
+make test_stop