diff --git a/devstack/lib/nova b/devstack/lib/nova
index 7350a7632..211a6d6b9 100644
--- a/devstack/lib/nova
+++ b/devstack/lib/nova
@@ -13,7 +13,7 @@
 # - configure_nova_docker
 
 # Save trace setting
-XTRACE=$(set +o | grep xtrace)
+_XTRACE_ZUN_NOVA=$(set +o | grep xtrace)
 set +o xtrace
 
 # Defaults
@@ -58,3 +58,6 @@ function configure_nova_docker {
     local rootwrap_conf_src_dir="$DEST/zun/etc/nova"
     sudo install -o root -g root -m 644 $rootwrap_conf_src_dir/rootwrap.d/*.filters /etc/nova/rootwrap.d
 }
+
+# Restore xtrace
+$_XTRACE_ZUN_NOVA
diff --git a/devstack/lib/zun b/devstack/lib/zun
index 6756df591..8eb0b7418 100644
--- a/devstack/lib/zun
+++ b/devstack/lib/zun
@@ -44,7 +44,7 @@ ZUN_CONF_DIR=/etc/zun
 ZUN_CONF=$ZUN_CONF_DIR/zun.conf
 ZUN_POLICY_JSON=$ZUN_CONF_DIR/policy.json
 ZUN_API_PASTE=$ZUN_CONF_DIR/api-paste.ini
- 
+
 if is_ssl_enabled_service "zun" || is_service_enabled tls-proxy; then
     ZUN_SERVICE_PROTOCOL="https"
 fi