diff --git a/jenkins/jobs/diskimage-builder.yaml b/jenkins/jobs/diskimage-builder.yaml
index e9e1e2a936..2c64ef176d 100644
--- a/jenkins/jobs/diskimage-builder.yaml
+++ b/jenkins/jobs/diskimage-builder.yaml
@@ -30,7 +30,9 @@
           source ./env/bin/activate
           set -u
           ./openstack/diskimage-builder/tests/run_functests.sh
+          set +u
           deactivate
+          set -u
 
     publishers:
       - console-log