diff --git a/tasks/install.yml b/tasks/install.yml
index 4ec4768..bb0a67a 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -14,8 +14,8 @@
 # limitations under the License.
 
 - include: 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/tasks/main.yml b/tasks/main.yml
index 4ff33c9..22a62d8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -36,7 +36,7 @@
     - rally-config
 
 - include: database-setup.yml
-  when:
-    - inventory_hostname == groups[rally_role_project_group][0]
+  static: no
+  when: inventory_hostname == groups[rally_role_project_group][0]
   tags:
     - rally-install
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index 54a9007..ddaa3ae 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -6,6 +6,10 @@
   src: https://git.openstack.org/openstack/openstack-ansible-pip_install
   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