diff --git a/integration/scripts/conf/test_begin.conf b/integration/scripts/conf/test_begin.conf
index 1352ecc55e..0d6a7e5d0a 100644
--- a/integration/scripts/conf/test_begin.conf
+++ b/integration/scripts/conf/test_begin.conf
@@ -20,7 +20,7 @@
     "flavors": null,
 
     "white_box":false,
-    "start_services": true,
+    "start_services": %startservices%,
     "test_mgmt":false,
     "use_local_ovz":false,
     "use_venv":false,
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack
index 59bb6a5a78..69e8149ec9 100755
--- a/integration/scripts/trovestack
+++ b/integration/scripts/trovestack
@@ -700,6 +700,12 @@ function mod_confs() {
     cat $DATASTORE_CONF | sudo tee -a $TEST_CONF > /dev/null
     cat $TROVESTACK_SCRIPTS/conf/test_end.conf | sudo tee -a $TEST_CONF > /dev/null
 
+    #When running in the gate, don't start services
+    if [ "${DEVSTACK_GATE_TROVE}" == "1" ]; then
+        sed -i "s,%startservices%,false,g" ${TEST_CONF}
+    else
+        sed -i "s,%startservices%,true,g" ${TEST_CONF}
+    fi
     #Add the paths to the test conf
     sed -i "s,%report_directory%,$TROVE_REPORT_DIR,g" $TEST_CONF
     sed -i "s,%keystone_path%,$PATH_KEYSTONE,g" $TEST_CONF