diff --git a/README.md b/README.md
index 7676248ff..08c0956c9 100644
--- a/README.md
+++ b/README.md
@@ -182,22 +182,23 @@ reproduce these tests on your environment if you wish.
 
 This is the current matrix of available tests:
 
-|     -      | scenario001 | scenario002 |
-|:----------:|:-----------:|:-----------:|
-| keystone   |      X      |       X     |
-| glance     |      X      |       X     |
-| nova       |      X      |       X     |
-| neutron    |      X      |       X     |
-| cinder     |      X      |             |
-| ceilometer |      X      |             |
-| aodh       |      X      |             |
-| heat       |             |       X     |
-| swift      |             |       X     |
-| sahara     |             |       X     |
-| trove      |             |       X     |
-| horizon    |             |       X     |
-| manila     |      X      |             |
-| nagios     |      X      |             |
+|     -      | scenario001 | scenario002 | scenario003 |
+|:----------:|:-----------:|:-----------:|:------------:
+| keystone   |      X      |      X      |      X      |
+| glance     |    file     |    swift    |     file    |
+| nova       |      X      |      X      |      X      |
+| neutron    |      X      |      X      |      X      |
+| cinder     |      X      |             |             |
+| ceilometer |             |             |      X      |
+| aodh       |             |             |      X      |
+| gnocchi    |             |             |      X      |
+| heat       |             |             |      X      |
+| swift      |             |      X      |             |
+| sahara     |             |      X      |             |
+| trove      |             |      X      |             |
+| horizon    |      X      |             |             |
+| manila     |      X      |             |             |
+| nagios     |      X      |             |             |
 
 To run these tests:
 
diff --git a/tests/scenario001.sh b/tests/scenario001.sh
index f0d75483e..baf8da8b2 100755
--- a/tests/scenario001.sh
+++ b/tests/scenario001.sh
@@ -9,24 +9,23 @@ echo -e "Generating packstack config for:
 - nova
 - neutron (ovs+vxlan)
 - cinder (lvm+iscsi)
-- ceilometer
-- aodh
-- gnocchi
-- trove
 - manila
 - nagios
-- tempest (regex: 'smoke TelemetryAlarming')"
+- tempest (regex: 'smoke')"
 echo "tempest will run if packstack's installation completes successfully."
 echo
 
 $SUDO packstack --allinone \
           --debug \
+          --service-workers=2 \
           --default-password="packstack" \
+          --os-aodh-install=n \
+          --os-ceilometer-install=n \
+          --os-gnocchi-install=n \
           --os-swift-install=n \
-          --os-horizon-install=n \
           --os-manila-install=y \
-          --glance-backend=swift \
+          --glance-backend=file \
           --provision-demo=y \
           --provision-tempest=y \
           --run-tempest=y \
-          --run-tempest-tests="smoke TelemetryAlarming" || export FAILURE=true
+          --run-tempest-tests="smoke dashboard" || export FAILURE=true
diff --git a/tests/scenario002.sh b/tests/scenario002.sh
index 886c51046..6dc02ea87 100755
--- a/tests/scenario002.sh
+++ b/tests/scenario002.sh
@@ -8,10 +8,8 @@ echo -e "Generating packstack config for:
 - glance (swift backend)
 - nova
 - neutron (ovs+vxlan)
-- heat
 - swift
 - sahara
-- horizon
 - trove
 - tempest (regex: 'smoke dashboard')"
 echo "tempest will run if packstack's installation completes successfully."
@@ -19,17 +17,18 @@ echo
 
 $SUDO packstack --allinone \
           --debug \
+          --service-workers=2 \
           --default-password="packstack" \
           --os-aodh-install=n \
           --os-ceilometer-install=n \
           --os-gnocchi-install=n \
           --os-cinder-install=n \
+          --os-horizon-install=n \
           --nagios-install=n \
           --glance-backend=swift \
           --os-sahara-install=y \
-          --os-heat-install=y \
           --os-trove-install=y \
           --provision-demo=y \
           --provision-tempest=y \
           --run-tempest=y \
-          --run-tempest-tests="smoke dashboard" || export FAILURE=true
+          --run-tempest-tests="smoke" || export FAILURE=true
diff --git a/tests/scenario003.sh b/tests/scenario003.sh
new file mode 100644
index 000000000..bf7e22d4a
--- /dev/null
+++ b/tests/scenario003.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+if [ $(id -u) != 0 ]; then
+    SUDO='sudo'
+fi
+
+echo -e "Generating packstack config for:
+- keystone
+- glance (file backend)
+- nova
+- neutron (ovs+vxlan)
+- ceilometer
+- aodh
+- gnocchi
+- heat
+- tempest (regex: 'smoke TelemetryAlarming')"
+echo "tempest will run if packstack's installation completes successfully."
+echo
+
+$SUDO packstack --allinone \
+          --debug \
+          --service-workers=2 \
+          --default-password="packstack" \
+          --os-swift-install=n \
+          --os-horizon-install=n \
+          --glance-backend=file \
+          --os-heat-install=y \
+          --provision-demo=y \
+          --provision-tempest=y \
+          --run-tempest=y \
+          --run-tempest-tests="smoke TelemetryAlarming" || export FAILURE=true