diff --git a/upgrade-tempest b/upgrade-tempest
index fa687567..a6a1eb0e 100755
--- a/upgrade-tempest
+++ b/upgrade-tempest
@@ -78,9 +78,15 @@ if $(source $BASE_DEVSTACK_DIR/stackrc; is_service_enabled neutron); then
     Q_L3_ENABLED="True"
 fi
 
+if [[ -f $BASE_RELEASE_DIR/tempest/etc/tempest.conf ]]; then
+    # Use the same config to target smoke tests.
+    cp $BASE_RELEASE_DIR/tempest/etc/tempest.conf $TARGET_RELEASE_DIR/tempest/etc/tempest.conf
+else
+    configure_tempest
+fi
+
 install_tempest_plugins
-# Use the same config to target smoke tests.
-cp $BASE_RELEASE_DIR/tempest/etc/tempest.conf $TARGET_RELEASE_DIR/tempest/etc/tempest.conf
+
 DEST=$DEST_BACKUP
 
 set +o xtrace