diff --git a/extras.d/70-trove b/extras.d/70-trove.sh
similarity index 100%
rename from extras.d/70-trove
rename to extras.d/70-trove.sh
diff --git a/files/rpms-suse/general b/files/rpms-suse/general
index 98c2795..704947e 100644
--- a/files/rpms-suse/general
+++ b/files/rpms-suse/general
@@ -17,6 +17,7 @@
 unzip
 vim-enhanced
 wget
+bc
 
 findutils-locate # useful when debugging
 lsof # useful when debugging
diff --git a/files/rpms/general b/files/rpms/general
index 40246ea..6cfe31e 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -21,6 +21,7 @@
 unzip
 wget
 which
+bc
 
 # [1] : some of installed tools have unversioned dependencies on this,
 # but others have versioned (<=0.7).  So if a later version (0.7.1)
diff --git a/lib/ceilometer b/lib/ceilometer
index 6f3896f..30bf3ae 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -52,7 +52,10 @@
 CEILOMETER_SERVICE_PROTOCOL=http
 CEILOMETER_SERVICE_HOST=$SERVICE_HOST
 CEILOMETER_SERVICE_PORT=${CEILOMETER_SERVICE_PORT:-8777}
-#
+
+# Tell Tempest this project is present
+TEMPEST_SERVICES+=,ceilometer
+
 
 # Functions
 # ---------
diff --git a/lib/cinder b/lib/cinder
index d76a41d..9f70b2a 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -79,6 +79,9 @@
 
 VOLUME_NAME_PREFIX=${VOLUME_NAME_PREFIX:-volume-}
 
+# Tell Tempest this project is present
+TEMPEST_SERVICES+=,cinder
+
 
 # Functions
 # ---------
diff --git a/lib/glance b/lib/glance
index 55d5fb3..2d41ea4 100644
--- a/lib/glance
+++ b/lib/glance
@@ -52,6 +52,9 @@
 # Glance connection info.  Note the port must be specified.
 GLANCE_HOSTPORT=${GLANCE_HOSTPORT:-$SERVICE_HOST:9292}
 
+# Tell Tempest this project is present
+TEMPEST_SERVICES+=,glance
+
 
 # Functions
 # ---------
diff --git a/lib/heat b/lib/heat
index b9b8aa6..467619f 100644
--- a/lib/heat
+++ b/lib/heat
@@ -38,6 +38,10 @@
 HEAT_ENV_DIR=$HEAT_CONF_DIR/environment.d
 HEAT_TEMPLATES_DIR=$HEAT_CONF_DIR/templates
 
+# Tell Tempest this project is present
+TEMPEST_SERVICES+=,heat
+
+
 # Functions
 # ---------
 
diff --git a/lib/horizon b/lib/horizon
index 5bff712..c64d850 100644
--- a/lib/horizon
+++ b/lib/horizon
@@ -31,6 +31,9 @@
 # The example file in Horizon repo is used by default.
 HORIZON_SETTINGS=${HORIZON_SETTINGS:-$HORIZON_DIR/openstack_dashboard/local/local_settings.py.example}
 
+# Tell Tempest this project is present
+TEMPEST_SERVICES+=,horizon
+
 
 # Functions
 # ---------
diff --git a/lib/ironic b/lib/ironic
index afbc3e0..b8838f5 100644
--- a/lib/ironic
+++ b/lib/ironic
@@ -42,6 +42,9 @@
 IRONIC_SERVICE_PROTOCOL=http
 IRONIC_HOSTPORT=${IRONIC_HOSTPORT:-$SERVICE_HOST:6385}
 
+# Tell Tempest this project is present
+TEMPEST_SERVICES+=,ironic
+
 
 # Functions
 # ---------
diff --git a/lib/keystone b/lib/keystone
index 0850fb2..4f7f68b 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -178,6 +178,7 @@
     # Set the URL advertised in the ``versions`` structure returned by the '/' route
     iniset $KEYSTONE_CONF DEFAULT public_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:%(public_port)s/"
     iniset $KEYSTONE_CONF DEFAULT admin_endpoint "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:%(admin_port)s/"
+    iniset $KEYSTONE_CONF DEFAULT admin_bind_host "$KEYSTONE_SERVICE_HOST"
 
     # Register SSL certificates if provided
     if is_ssl_enabled_service key; then
diff --git a/lib/marconi b/lib/marconi
index 6b9ffdc..1eaebbd 100644
--- a/lib/marconi
+++ b/lib/marconi
@@ -51,6 +51,10 @@
 MARCONICLIENT_REPO=${MARCONICLIENT_REPO:-${GIT_BASE}/openstack/python-marconiclient.git}
 MARCONICLIENT_BRANCH=${MARCONICLIENT_BRANCH:-master}
 
+# Tell Tempest this project is present
+TEMPEST_SERVICES+=,marconi
+
+
 # Functions
 # ---------
 
diff --git a/lib/neutron b/lib/neutron
index 960f11b..81db2a7 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -237,6 +237,10 @@
     Q_USE_SECGROUP=False
 fi
 
+# Tell Tempest this project is present
+TEMPEST_SERVICES+=,neutron
+
+
 # Functions
 # ---------
 
@@ -505,7 +509,7 @@
         [ ! -z "$pid" ] && sudo kill -9 $pid
     fi
     if is_service_enabled q-meta; then
-        sudo pkill -9 neutron-ns-metadata-proxy || :
+        sudo pkill -9 -f neutron-ns-metadata-proxy || :
     fi
 
     if is_service_enabled q-lbaas; then
diff --git a/lib/nova b/lib/nova
index dbaa3f5..9db19ed 100644
--- a/lib/nova
+++ b/lib/nova
@@ -122,6 +122,9 @@
 TEST_FLOATING_POOL=${TEST_FLOATING_POOL:-test}
 TEST_FLOATING_RANGE=${TEST_FLOATING_RANGE:-192.168.253.0/29}
 
+# Tell Tempest this project is present
+TEMPEST_SERVICES+=,nova
+
 
 # Functions
 # ---------
diff --git a/lib/savanna b/lib/savanna
index c7d59f7..6f42311 100644
--- a/lib/savanna
+++ b/lib/savanna
@@ -26,7 +26,7 @@
 # Set up default directories
 SAVANNA_DIR=$DEST/savanna
 SAVANNA_CONF_DIR=${SAVANNA_CONF_DIR:-/etc/savanna}
-SAVANNA_CONF_FILE=savanna.conf
+SAVANNA_CONF_FILE=${SAVANNA_CONF_DIR}/savanna.conf
 SAVANNA_DEBUG=${SAVANNA_DEBUG:-True}
 
 SAVANNA_SERVICE_HOST=${SAVANNA_SERVICE_HOST:-$SERVICE_HOST}
@@ -40,6 +40,10 @@
     SAVANNA_BIN_DIR=$(get_python_exec_prefix)
 fi
 
+# Tell Tempest this project is present
+TEMPEST_SERVICES+=,savanna
+
+
 # Functions
 # ---------
 
@@ -88,24 +92,24 @@
     sudo chown $STACK_USER $SAVANNA_CONF_DIR
 
     # Copy over savanna configuration file and configure common parameters.
-    cp $SAVANNA_DIR/etc/savanna/savanna.conf.sample $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE
+    cp $SAVANNA_DIR/etc/savanna/savanna.conf.sample $SAVANNA_CONF_FILE
 
-    iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE DEFAULT os_admin_password $SERVICE_PASSWORD
-    iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE DEFAULT os_admin_username savanna
-    iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE DEFAULT os_admin_tenant_name $SERVICE_TENANT_NAME
-    iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE DEFAULT debug $SAVANNA_DEBUG
+    iniset $SAVANNA_CONF_FILE DEFAULT os_admin_password $SERVICE_PASSWORD
+    iniset $SAVANNA_CONF_FILE DEFAULT os_admin_username savanna
+    iniset $SAVANNA_CONF_FILE DEFAULT os_admin_tenant_name $SERVICE_TENANT_NAME
+    iniset $SAVANNA_CONF_FILE DEFAULT debug $SAVANNA_DEBUG
 
-    iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE database connection `database_connection_url savanna`
+    iniset $SAVANNA_CONF_FILE database connection `database_connection_url savanna`
 
     if is_service_enabled neutron; then
-        iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE DEFAULT use_neutron true
-        iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE DEFAULT use_floating_ips true
+        iniset $SAVANNA_CONF_FILE DEFAULT use_neutron true
+        iniset $SAVANNA_CONF_FILE DEFAULT use_floating_ips true
     fi
 
-    iniset $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE DEFAULT use_syslog $SYSLOG
+    iniset $SAVANNA_CONF_FILE DEFAULT use_syslog $SYSLOG
 
     recreate_database savanna utf8
-    $SAVANNA_BIN_DIR/savanna-db-manage --config-file $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE upgrade head
+    $SAVANNA_BIN_DIR/savanna-db-manage --config-file $SAVANNA_CONF_FILE upgrade head
 }
 
 # install_savanna() - Collect source and prepare
@@ -116,7 +120,7 @@
 
 # start_savanna() - Start running processes, including screen
 function start_savanna() {
-    screen_it savanna "cd $SAVANNA_DIR && $SAVANNA_BIN_DIR/savanna-api --config-file $SAVANNA_CONF_DIR/$SAVANNA_CONF_FILE"
+    screen_it savanna "cd $SAVANNA_DIR && $SAVANNA_BIN_DIR/savanna-api --config-file $SAVANNA_CONF_FILE"
 }
 
 # stop_savanna() - Stop running processes
diff --git a/lib/swift b/lib/swift
index baa03ec..54d6f1c 100644
--- a/lib/swift
+++ b/lib/swift
@@ -111,6 +111,9 @@
 CONTAINER_PORT_BASE=${CONTAINER_PORT_BASE:-6011}
 ACCOUNT_PORT_BASE=${ACCOUNT_PORT_BASE:-6012}
 
+# Tell Tempest this project is present
+TEMPEST_SERVICES+=,swift
+
 
 # Functions
 # ---------
diff --git a/lib/tempest b/lib/tempest
index ef9dfe2..ee99665 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -329,7 +329,7 @@
     iniset $TEMPEST_CONF network-feature-enabled api_extensions "${NETWORK_API_EXTENSIONS:-all}"
 
     # service_available
-    for service in nova cinder glance neutron swift heat horizon ceilometer ironic savanna trove marconi; do
+    for service in ${TEMPEST_SERVICES//,/ }; do
         if is_service_enabled $service ; then
             iniset $TEMPEST_CONF service_available $service "True"
         else
diff --git a/lib/trove b/lib/trove
index 9c91024..1fd011a 100644
--- a/lib/trove
+++ b/lib/trove
@@ -38,6 +38,10 @@
     TROVE_BIN_DIR=$(get_python_exec_prefix)
 fi
 
+# Tell Tempest this project is present
+TEMPEST_SERVICES+=,trove
+
+
 # Functions
 # ---------
 
diff --git a/stackrc b/stackrc
index 8a0280e..197b4cf 100644
--- a/stackrc
+++ b/stackrc
@@ -37,6 +37,12 @@
 #  enable_service tempest
 ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-cond,cinder,c-sch,c-api,c-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,rabbit,tempest,mysql
 
+# Tell Tempest which services are available.  The default is set here as
+# Tempest falls late in the configuration sequence.  This differs from
+# ``ENABLED_SERVICES`` in that the project names are used here rather than
+# the service names, i.e.: TEMPEST_SERVICES="key,glance,nova"
+TEMPEST_SERVICES=""
+
 # Set the default Nova APIs to enable
 NOVA_ENABLED_APIS=ec2,osapi_compute,metadata