diff --git a/slave_scripts/devstack-vm-gate.sh b/slave_scripts/devstack-vm-gate.sh
index b66839fb..325c79c6 100755
--- a/slave_scripts/devstack-vm-gate.sh
+++ b/slave_scripts/devstack-vm-gate.sh
@@ -66,6 +66,13 @@ done
 # we are testing the proposed change from this point forward.
 CI_SCRIPT_DIR=$WORKSPACE/openstack-ci/slave_scripts
 
+# Also, if we're testing openstack-ci, re-exec this script once so
+# that we can test the new version of it.
+if [[ $GERRIT_PROJECT == "openstack/openstack-ci" ]] && [[ $RE_EXEC != "true" ]]; then
+    export RE_EXEC="true"
+    exec $CI_SCRIPT_DIR/devstack-vm-gate.sh
+fi
+
 FETCH_OUTPUT=`$CI_SCRIPT_DIR/devstack-vm-fetch.py` || exit $?
 eval $FETCH_OUTPUT