diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index ba9188a5..9ccf1814 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -42,3 +42,7 @@
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
   scm: git
   version: master
+- name: os_previous_glance
+  src: https://git.openstack.org/openstack/openstack-ansible-os_glance
+  scm: git
+  version: stable/newton
diff --git a/tests/test-install-previous-glance.yml b/tests/test-install-previous-glance.yml
new file mode 100644
index 00000000..f4a8b5ec
--- /dev/null
+++ b/tests/test-install-previous-glance.yml
@@ -0,0 +1,31 @@
+---
+# Copyright 2016, 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.
+
+- name: Playbook for deploying glance
+  hosts: glance_all
+  user: root
+  gather_facts: true
+  pre_tasks:
+    - include: common/ensure-rabbitmq.yml
+      vhost_name: "{{ glance_rabbitmq_vhost }}"
+      user_name: "{{ glance_rabbitmq_userid }}"
+      user_password: "{{ glance_rabbitmq_password }}"
+    - include: common/create-grant-db.yml
+      db_name: "{{  glance_galera_database }}"
+      db_password: "{{ glance_container_mysql_password }}"
+  roles:
+    - role: "os_previous_glance"
+  vars_files:
+    - common/previous/test-vars.yml
diff --git a/tests/test.yml b/tests/test.yml
index 6efeced0..41d003d2 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -22,6 +22,12 @@
 # Install Keystone
 - include: common/test-install-keystone.yml
 
+# Install previous version of Glance
+- include: test-install-previous-glance.yml
+  when:
+    - glance_upgrade is defined
+    - glance_upgrade | bool
+
 # Install Glance
 - include: common/test-install-glance.yml
 
diff --git a/tox.ini b/tox.ini
index ef28cf33..fa9ca5bf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -102,6 +102,21 @@ commands =
     bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
 
 
+[testenv:upgrade]
+deps =
+    {[testenv:ansible]deps}
+setenv =
+    {[testenv]setenv}
+    ANSIBLE_PARAMETERS=-vvv -e glance_upgrade=True
+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"
+
+
 [testenv:functional]
 deps =
     {[testenv:ansible]deps}