diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 25a522c3..69e397d1 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -46,6 +46,18 @@ source $WORKSPACE/devstack-gate/functions.sh
 
 start_timer
 
+# Note that service/project enablement vars are here so that they can be
+# used to select the PROJECTS list below reliably.
+
+# Set to 1 to run sahara
+export DEVSTACK_GATE_SAHARA=${DEVSTACK_GATE_SAHARA:-0}
+
+# Set to 1 to run trove
+export DEVSTACK_GATE_TROVE=${DEVSTACK_GATE_TROVE:-0}
+
+# are we pulling any libraries from git
+export DEVSTACK_PROJECT_FROM_GIT=${DEVSTACK_PROJECT_FROM_GIT:-}
+
 # Save the PROJECTS variable as it was passed in.  This is needed for reproduce.sh
 # incase the job definition contains items that are not in the "global" list
 # below.
@@ -80,15 +92,12 @@ PROJECTS="openstack/tempest-lib $PROJECTS"
 # which is not free.
 PROJECTS="openstack-infra/tripleo-ci $PROJECTS"
 PROJECTS="openstack/automaton $PROJECTS"
-PROJECTS="openstack/cliff $PROJECTS"
-PROJECTS="openstack/debtcollector $PROJECTS"
 # The devstack heat plugin uses these repos
 if [[ "$DEVSTACK_GATE_HEAT" -eq "1" ]] ; then
     PROJECTS="openstack/dib-utils $PROJECTS"
     PROJECTS="openstack/diskimage-builder $PROJECTS"
 fi
 PROJECTS="openstack/django_openstack_auth $PROJECTS"
-PROJECTS="openstack/futurist $PROJECTS"
 PROJECTS="openstack/manila $PROJECTS"
 PROJECTS="openstack/manila-ui $PROJECTS"
 PROJECTS="openstack/zaqar $PROJECTS"
@@ -121,16 +130,24 @@ PROJECTS="openstack/oslo.serialization $PROJECTS"
 PROJECTS="openstack/oslo.service $PROJECTS"
 PROJECTS="openstack/oslo.versionedobjects $PROJECTS"
 PROJECTS="openstack/oslo.vmware $PROJECTS"
-PROJECTS="openstack/pycadf $PROJECTS"
-PROJECTS="openstack/sahara $PROJECTS"
-PROJECTS="openstack/sahara-dashboard $PROJECTS"
-PROJECTS="openstack/stevedore $PROJECTS"
+if [[ "$DEVSTACK_GATE_SAHARA" -eq "1" ]] ; then
+    PROJECTS="openstack/sahara $PROJECTS"
+    PROJECTS="openstack/sahara-dashboard $PROJECTS"
+fi
 PROJECTS="openstack/taskflow $PROJECTS"
 PROJECTS="openstack/tooz $PROJECTS"
 PROJECTS="openstack/tripleo-heat-templates $PROJECTS"
 PROJECTS="openstack/tripleo-image-elements $PROJECTS"
 PROJECTS="openstack/tripleo-incubator $PROJECTS"
-PROJECTS="openstack/trove $PROJECTS"
+if [[ "$DEVSTACK_GATE_TROVE" -eq "1" ]] ; then
+    PROJECTS="openstack/trove $PROJECTS"
+fi
+if [[ -n "$DEVSTACK_PROJECT_FROM_GIT" ]] ; then
+    # We populate the PROJECTS list with any libs that should be installed
+    # from source and not pypi assuming that live under openstack/
+    PROCESSED_FROM_GIT=$(echo "openstack/$DEVSTACK_PROJECT_FROM_GIT" | sed -e 's/,/ openstack\//g')
+    PROJECTS="$PROCESSED_FROM_GIT $PROJECTS"
+fi
 
 # Remove duplicates as they result in errors when managing
 # git state.
@@ -237,12 +254,6 @@ export DEVSTACK_GATE_IRONIC_DRIVER=${DEVSTACK_GATE_IRONIC_DRIVER:-pxe_ssh}
 # Set to 0 to avoid building Ironic deploy ramdisks
 export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=${DEVSTACK_GATE_IRONIC_BUILD_RAMDISK:-1}
 
-# Set to 1 to run sahara
-export DEVSTACK_GATE_SAHARA=${DEVSTACK_GATE_SAHARA:-0}
-
-# Set to 1 to run trove
-export DEVSTACK_GATE_TROVE=${DEVSTACK_GATE_TROVE:-0}
-
 # Set to 0 to disable config_drive and use the metadata server instead
 export DEVSTACK_GATE_CONFIGDRIVE=${DEVSTACK_GATE_CONFIGDRIVE:-0}
 
@@ -256,9 +267,6 @@ if [ ${DEFAULT_CONCURRENCY} -gt 3 ] ; then
 fi
 export TEMPEST_CONCURRENCY=${TEMPEST_CONCURRENCY:-${DEFAULT_CONCURRENCY}}
 
-# are we pulling any libraries from git
-export DEVSTACK_PROJECT_FROM_GIT=${DEVSTACK_PROJECT_FROM_GIT:-}
-
 # The following variable is set for different directions of Grenade updating
 # for a stable branch we want to both try to upgrade forward n => n+1 as
 # well as upgrade from last n-1 => n.