diff --git a/Makefile b/Makefile
index 615c3aabc..c35fc387a 100644
--- a/Makefile
+++ b/Makefile
@@ -147,9 +147,9 @@ stop-%: work/redis/bin/redis-cli
 
 stop: redis-stop sentinel-stop cluster-stop
 
-test_start:
+test:
 	$(MAKE) start
 	sleep 2
-
-test_stop:
+	./mvnw clean test -U -DrunLongTests=true -P$(SPRING_PROFILE) || (echo "maven failed $$?"; exit 1)
 	$(MAKE) stop
+
diff --git a/ci/test.sh b/ci/test.sh
index bb428a75c..2ccd978e8 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -11,7 +11,7 @@ cd spring-data-redis-github
 ln -sf /work
 
 # Launch Redis in proper configuration
-make test_start
+make start
 
 ./mvnw -U clean test -DrunLongTests=true -Pspring5-next
 
@@ -19,6 +19,6 @@ make test_start
 RESULT=$?
 
 # Shutdown Redis
-make test_stop
+make stop
 
 exit $RESULT