diff --git a/tasks/glance_init_common.yml b/tasks/glance_init_common.yml
index b0ecefac..ddddfcb6 100644
--- a/tasks/glance_init_common.yml
+++ b/tasks/glance_init_common.yml
@@ -14,9 +14,11 @@
 # limitations under the License.
 
 - include: glance_init_upstart.yml
+  static: no
   when: pid1_name == "init"
 
 - include: glance_init_systemd.yml
+  static: no
   when: pid1_name == "systemd"
 
 - name: Load service
diff --git a/tasks/glance_install.yml b/tasks/glance_install.yml
index c706b3ed..3a48c038 100644
--- a/tasks/glance_install.yml
+++ b/tasks/glance_install.yml
@@ -14,10 +14,12 @@
 # limitations under the License.
 
 - include: glance_install_apt.yml
+  static: no
   when:
     - ansible_pkg_mgr == 'apt'
 
 - include: glance_install_yum.yml
+  static: no
   when:
     - ansible_pkg_mgr == 'yum'
 
diff --git a/tasks/main.yml b/tasks/main.yml
index b03e2229..782e08c9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -55,14 +55,14 @@
     - glance-install
 
 - include: glance_db_setup.yml
-  when: >
-    inventory_hostname == groups['glance_all'][0]
+  static: no
+  when: inventory_hostname == groups['glance_all'][0]
   tags:
     - glance-install
 
 - include: glance_service_setup.yml
-  when: >
-    inventory_hostname == groups['glance_all'][0]
+  static: no
+  when: inventory_hostname == groups['glance_all'][0]
   tags:
     - glance-install
 
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index e4a6a083..ba9188a5 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -10,6 +10,10 @@
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
   scm: git
   version: master
+- name: openstack_hosts
+  src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
+  scm: git
+  version: master
 - name: lxc_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
   scm: git