diff --git a/defaults/main.yml b/defaults/main.yml
index a3aca6c6..76b82854 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -22,7 +22,7 @@ glance_package_state: "latest"
 glance_pip_package_state: "latest"
 
 glance_git_repo: https://git.openstack.org/openstack/glance
-glance_git_install_branch: master
+glance_git_install_branch: "stable/queens"
 glance_developer_mode: false
 glance_developer_constraints:
   - "git+{{ glance_git_repo }}@{{ glance_git_install_branch }}#egg=glance"
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index 91c6a74d..320f2af5 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -1,55 +1,55 @@
 - name: apt_package_pinning
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
   scm: git
-  version: master
+  version: stable/queens
 - name: pip_install
   src: https://git.openstack.org/openstack/openstack-ansible-pip_install
   scm: git
-  version: master
+  version: stable/queens
 - name: memcached_server
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
   scm: git
-  version: master
+  version: stable/queens
 - name: openstack_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
   scm: git
-  version: master
+  version: stable/queens
 - name: lxc_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
   scm: git
-  version: master
+  version: stable/queens
 - name: lxc_container_create
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
   scm: git
-  version: master
+  version: stable/queens
 - name: galera_client
   src: https://git.openstack.org/openstack/openstack-ansible-galera_client
   scm: git
-  version: master
+  version: stable/queens
 - name: galera_server
   src: https://git.openstack.org/openstack/openstack-ansible-galera_server
   scm: git
-  version: master
+  version: stable/queens
 - name: rabbitmq_server
   src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
   scm: git
-  version: master
+  version: stable/queens
 - name: os_keystone
   src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
   scm: git
-  version: master
+  version: stable/queens
 - name: openstack_openrc
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
   scm: git
-  version: master
+  version: stable/queens
 - name: ceph_client
   src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
   scm: git
-  version: master
+  version: stable/queens
 - name: os_tempest
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
   scm: git
-  version: master
+  version: stable/queens
 - name: os_previous_glance
   src: https://git.openstack.org/openstack/openstack-ansible-os_glance
   scm: git
diff --git a/tests/test-benchmark-glance-upgrade.yml b/tests/test-benchmark-glance-upgrade.yml
index 0d6c5b4c..5a9a2904 100644
--- a/tests/test-benchmark-glance-upgrade.yml
+++ b/tests/test-benchmark-glance-upgrade.yml
@@ -27,6 +27,9 @@
       - "python-glanceclient"
       - "openstacksdk"
   tasks:
+    - name: Lay clouds.yaml file
+      include_role:
+        name: openstack_openrc
     - name: Install openstack clients
       pip:
         name: "{{ upgrade_test_packages }}"
diff --git a/tox.ini b/tox.ini
index cd244cdb..b8c838c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -75,8 +75,8 @@ commands =
 [testenv:ansible]
 deps =
     {[testenv]deps}
-    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt
-    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt
+    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt?h=stable/queens
+    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=stable/queens
 
 
 [testenv:ansible-syntax]