diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 88599af3..f11b016f 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -19,7 +19,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-PROJECTS="openstack-dev/devstack openstack/nova openstack/glance openstack/keystone openstack/python-novaclient openstack/python-keystoneclient openstack/python-quantumclient openstack/python-glanceclient openstack/python-openstackclient openstack/horizon openstack/quantum openstack/tempest openstack/cinder openstack/python-cinderclient openstack/swift openstack/python-swiftclient"
+PROJECTS="openstack-dev/devstack openstack/nova openstack/glance openstack/keystone openstack/python-novaclient openstack/python-keystoneclient openstack/python-quantumclient openstack/python-glanceclient openstack/python-openstackclient openstack/horizon openstack/quantum openstack/tempest openstack/cinder openstack/python-cinderclient openstack/swift openstack/python-swiftclient ${PROJECTS}"
 
 # Set to 1 to run the Tempest test suite
 export DEVSTACK_GATE_TEMPEST=${DEVSTACK_GATE_TEMPEST:-0}
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index befccfbc..ac5dff43 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -23,9 +23,20 @@ set -o errexit
 
 cd $BASE/new/devstack
 
-rm -f localrc
+# Allow calling context to pre-populate the localrc file with additional values
+if [ -z $KEEP_LOCALRC ] ; then
+    rm -f localrc
+fi
 
-ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-sch,horizon,mysql,rabbit,sysstat
+
+DEFAULT_ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-sch,horizon,mysql,rabbit,sysstat
+
+# Allow optional injection of ENABLED_SERVICES from the calling context
+if [ -z $ENABLED_SERVICES ] ; then
+    ENABLED_SERVICES=$DEFAULT_ENABLED_SERVICES
+else
+    ENABLED_SERVICES=$DEFAULT_ENABLED_SERVICES,$ENABLED_SERVICES
+fi
 
 if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
     ENABLED_SERVICES=$ENABLED_SERVICES,tempest