diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 553e071e..cadfb807 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -62,9 +62,10 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
 fi
 
 ./stack.sh
-./exercise.sh
 if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
   ./tools/configure_tempest.sh
   cd $DEST/tempest
   nosetests --with-xunit -sv $DEVSTACK_GATE_TEMPEST_TESTS
+else
+  ./exercise.sh
 fi