diff --git a/tasks/main.yml b/tasks/main.yml
index 934b143..2780759 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -50,14 +50,14 @@
     - sahara-install
 
 - include: sahara_db_setup.yml
-  when: >
-    inventory_hostname == groups['sahara_all'][0]
+  static: no
+  when: inventory_hostname == groups['sahara_all'][0]
   tags:
     - sahara-install
 
 - include: sahara_service_setup.yml
-  when: >
-    inventory_hostname == groups['sahara_all'][0]
+  static: no
+  when: inventory_hostname == groups['sahara_all'][0]
   tags:
     - sahara-install
 
diff --git a/tasks/sahara_init_common.yml b/tasks/sahara_init_common.yml
index b44d3fe..6263959 100644
--- a/tasks/sahara_init_common.yml
+++ b/tasks/sahara_init_common.yml
@@ -12,9 +12,11 @@
 # limitations under the License.
 
 - include: sahara_init_upstart.yml
+  static: no
   when: pid1_name == "init"
 
 - include: sahara_init_systemd.yml
+  static: no
   when: pid1_name == "systemd"
 
 - name: Load service
diff --git a/tasks/sahara_install.yml b/tasks/sahara_install.yml
index 1d1a0c9..a41f21d 100644
--- a/tasks/sahara_install.yml
+++ b/tasks/sahara_install.yml
@@ -12,8 +12,8 @@
 # limitations under the License.
 
 - include: sahara_install_apt.yml
-  when:
-    - ansible_pkg_mgr == 'apt'
+  static: no
+  when: ansible_pkg_mgr == 'apt'
 
 - name: Create developer mode constraint file
   copy:
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index a60a57f..afce09c 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