diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index 7e8c7dead1..66d37959da 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -3,8 +3,9 @@
 register_project_for_upgrade manila
 register_db_to_save manila
 
-BASE_RUN_SMOKE=False
-TARGET_RUN_SMOKE=False
+export BASE_RUN_SMOKE=False
+export TARGET_RUN_SMOKE=False
+export ENABLE_TEMPEST=False
 
 devstack_localrc base enable_service manila m-api m-shr m-sch m-dat
 devstack_localrc base enable_plugin manila git://git.openstack.org/openstack/manila stable/newton