diff --git a/tests/test-upgrade.yml b/tests/test-upgrade.yml
new file mode 100644
index 00000000..9066c2f7
--- /dev/null
+++ b/tests/test-upgrade.yml
@@ -0,0 +1,32 @@
+---
+# 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.
+
+# Setup the keys, host and containers
+- include: common/test-setup-host.yml
+
+# Install Memcached/Galera/Rabbitmq
+- include: common/test-install-infra.yml
+
+# Install Keystone
+- include: common/test-install-keystone.yml
+
+# Setup Swift-hosts
+- include: common/test-setup-swifthosts.yml
+
+# Install previous swift
+- include: test-install-previous-swift.yml
+
+# Install Swift
+- include: common/test-install-swift.yml
diff --git a/tests/test.yml b/tests/test.yml
index 29c165ce..acfbf650 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -25,11 +25,5 @@
 # Setup Swift-hosts
 - include: common/test-setup-swifthosts.yml
 
-# Install previous swift
-- include: test-install-previous-swift.yml
-  when:
-    - swift_upgrade is defined
-    - swift_upgrade | bool
-
 # Install Swift
 - include: common/test-install-swift.yml
diff --git a/tox.ini b/tox.ini
index ba44d2f6..a5064018 100644
--- a/tox.ini
+++ b/tox.ini
@@ -59,10 +59,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]
@@ -119,9 +115,13 @@ deps =
     {[testenv:ansible]deps}
 setenv =
     {[testenv]setenv}
-    ANSIBLE_PARAMETERS=-vvv -e swift_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"