diff --git a/Makefile b/Makefile
index 6524c8fe1..b46f28225 100644
--- a/Makefile
+++ b/Makefile
@@ -38,13 +38,17 @@ cleanup_env:
 pivoting_test:
 	make -C ./scripts/feature_tests/pivoting/
 
+repivoting_test:
+	make -C ./scripts/feature_tests/pivoting/ repivoting
+	make -C ./scripts/feature_tests/pivoting/ deprovision
+
 remediation_test:
 	make -C ./scripts/feature_tests/remediation/
 
 upgrade_test:
 	make -C ./scripts/feature_tests/upgrade/
 
-feature_tests: setup_env remediation_test cleanup_env pivoting_test
+feature_tests: setup_env remediation_test cleanup_env pivoting_test repivoting_test
 
 feature_tests_upgrade: setup_env_ug upgrade_test
 
diff --git a/scripts/feature_tests/pivoting/Makefile b/scripts/feature_tests/pivoting/Makefile
index 5e079026b..7712a8da5 100644
--- a/scripts/feature_tests/pivoting/Makefile
+++ b/scripts/feature_tests/pivoting/Makefile
@@ -2,7 +2,7 @@ M3PATH := "$(dirname "$(readlink -f "${0}")")../../../"
 export NUM_OF_MASTER_REPLICAS := 3
 export NUM_OF_WORKER_REPLICAS := 1
 
-all: provision fetch_manifests pivoting repivoting deprovision
+all: provision fetch_manifests pivoting
 
 provision:
 	./../feature_test_provisioning.sh