diff --git a/README.md b/README.md
index 7f231e8ae..3083a1d3d 100644
--- a/README.md
+++ b/README.md
@@ -169,29 +169,30 @@ need to go inside those directories to run puppet-lint !
 Packstack is integration tested in the OpenStack gate and provides the means to
 reproduce these tests on your environment if you wish.
 
-This is the current matrix of available tests:
+Scenario000 installs packstack allinone only and doesn't run any tests. This is
+the current matrix of available tests:
 
-|     -          | scenario001 | scenario002 | scenario003 |
-|:--------------:|:-----------:|:-----------:|:------------:
-| keystone       |   FERNET    |    UUID     |    FERNET   |
-| glance         |    file     |    swift    |     file    |
-| nova           |      X      |      X      |      X      |
-| neutron        |      X      |      X      |      X      |
-| neutron plugin |     ovs     |     ovs     |     ovs     |
-| lbaasv2        |             |      X      |             |
-| vpnaas         |             |             |             |
-| cinder         |      X      |             |             |
-| ceilometer     |             |             |      X      |
-| aodh           |             |             |      X      |
-| gnocchi        |             |             |      X      |
-| panko          |             |             |      X      |
-| heat           |             |             |      X      |
-| swift          |             |      X      |             |
-| sahara         |             |      X      |             |
-| trove          |             |      X      |             |
-| horizon        |      X      |             |             |
-| manila         |      X      |             |             |
-| SSL            |      X      |             |             |
+|     -          | scenario000 | scenario001 | scenario002 | scenario003 |
+|:--------------:|:-----------:|:-----------:|:-----------:|:------------:
+| keystone       |   FERNET    |   FERNET    |    UUID     |    FERNET   |
+| glance         |             |    file     |    swift    |     file    |
+| nova           |      X      |      X      |      X      |      X      |
+| neutron        |      X      |      X      |      X      |      X      |
+| neutron plugin |     ovs     |     ovs     |     ovs     |     ovs     |
+| lbaasv2        |             |             |      X      |             |
+| vpnaas         |             |             |             |             |
+| cinder         |      X      |      X      |             |             |
+| ceilometer     |      X      |             |             |      X      |
+| aodh           |      X      |             |             |      X      |
+| gnocchi        |      X      |             |             |      X      |
+| panko          |             |             |             |      X      |
+| heat           |             |             |             |      X      |
+| swift          |      X      |             |      X      |             |
+| sahara         |             |             |      X      |             |
+| trove          |             |             |      X      |             |
+| horizon        |             |      X      |             |             |
+| manila         |             |      X      |             |             |
+| SSL            |             |      X      |             |             |
 
 To run these tests:
 
diff --git a/playbooks/packstack-integration-tempest.yaml b/playbooks/packstack-integration-tempest.yaml
index bb6a87987..9101719d0 100644
--- a/playbooks/packstack-integration-tempest.yaml
+++ b/playbooks/packstack-integration-tempest.yaml
@@ -1,13 +1,3 @@
 - hosts: all
-  name: packstack-integration-tempest
-  tasks:
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export SCENARIO='{{ scenario }}'
-          ./run_tests.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace/packstack'
-      environment: '{{ zuul }}'
-
+  roles:
+    - packstack-integration-tempest
diff --git a/roles/packstack-integration-tempest/tasks/main.yaml b/roles/packstack-integration-tempest/tasks/main.yaml
new file mode 100644
index 000000000..bc7549131
--- /dev/null
+++ b/roles/packstack-integration-tempest/tasks/main.yaml
@@ -0,0 +1,10 @@
+- name: packstack-integration-tempest
+  shell:
+      cmd: |
+        set -e
+        set -x
+        export SCENARIO='{{ scenario }}'
+        ./run_tests.sh
+      executable: /bin/bash
+      chdir: '{{ ansible_user_dir }}/workspace/packstack'
+  environment: '{{ zuul }}'
diff --git a/tests/scenario000.sh b/tests/scenario000.sh
new file mode 100755
index 000000000..9ba6a504f
--- /dev/null
+++ b/tests/scenario000.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+if [ $(id -u) != 0 ]; then
+    SUDO='sudo'
+fi
+
+$SUDO packstack ${ADDITIONAL_ARGS} \
+          --allinone \
+          --debug \
+          --default-password="packstack" || export FAILURE=true