diff --git a/tests/test-upgrade.yml b/tests/test-upgrade.yml
new file mode 100644
index 00000000..2b86a54d
--- /dev/null
+++ b/tests/test-upgrade.yml
@@ -0,0 +1,38 @@
+---
+# Copyright 2015, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Prepare the user ssh keys
+- include: common/test-prepare-keys.yml
+
+# Prepare the host
+- include: common/test-prepare-host.yml
+
+# Prepare the containers
+- include: common/test-prepare-containers.yml
+
+# Install RabbitMQ/MariaDB
+- include: common/test-install-infra.yml
+
+# Install previous Keystone
+- include: test-install-previous-keystone.yml
+
+# Install Keystone
+- include: common/test-install-keystone.yml
+
+# Install and execute Tempest
+- include: common/test-install-tempest.yml
+
+# Test Keystone
+- include: test-keystone-functional.yml
diff --git a/tests/test.yml b/tests/test.yml
index 8236419b..d506503d 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -25,12 +25,6 @@
 # Install RabbitMQ/MariaDB
 - include: common/test-install-infra.yml
 
-# Install previous Keystone
-- include: test-install-previous-keystone.yml
-  when:
-    - keystone_upgrade is defined
-    - keystone_upgrade | bool
-
 # Install Keystone
 - include: common/test-install-keystone.yml
 
diff --git a/tox.ini b/tox.ini
index 2970468d..7b6bcb64 100644
--- a/tox.ini
+++ b/tox.ini
@@ -58,10 +58,6 @@ commands =
     bash -c "if [ ! -d "{toxinidir}/tests/common" ]; then \
                git clone https://git.openstack.org/openstack/openstack-ansible-tests {toxinidir}/tests/common; \
              fi"
-    bash -c "if [ ! -d "{toxinidir}/tests/common/previous" ]; then \
-               git clone https://git.openstack.org/openstack/openstack-ansible-tests -b stable/newton \
-                 {toxinidir}/tests/common/previous; \
-             fi"
 
 
 [testenv:pep8]
@@ -118,9 +114,13 @@ deps =
     {[testenv:ansible]deps}
 setenv =
     {[testenv]setenv}
-    ANSIBLE_PARAMETERS=-vvv -e keystone_upgrade=True
+    TEST_PLAYBOOK={toxinidir}/tests/test-upgrade.yml
 commands =
     {[testenv:tests_clone]commands}
+    bash -c "if [ ! -d "{toxinidir}/tests/common/previous" ]; then \
+               git clone https://git.openstack.org/openstack/openstack-ansible-tests -b stable/newton \
+                 {toxinidir}/tests/common/previous; \
+             fi"
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"