diff --git a/common-tasks/test-force-package-cache-update.yml b/common-tasks/test-force-package-cache-update.yml
new file mode 100644
index 00000000..7e6d9011
--- /dev/null
+++ b/common-tasks/test-force-package-cache-update.yml
@@ -0,0 +1,26 @@
+---
+# 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: First ensure apt cache is always refreshed
+  apt:
+    update_cache: true
+  when:
+    - ansible_pkg_mgr == 'apt'
+
+- name: First ensure yum cache is always refreshed
+  yum:
+    update_cache: true
+  when:
+    - ansible_pkg_mgr == 'yum'
diff --git a/test-install-openstack-hosts.yml b/test-install-openstack-hosts.yml
new file mode 100644
index 00000000..ff96c288
--- /dev/null
+++ b/test-install-openstack-hosts.yml
@@ -0,0 +1,25 @@
+---
+# 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: Execute the openstack-host role
+  hosts: localhost
+  connection: local
+  gather_facts: true
+  pre_tasks:
+    - include: "common-tasks/test-force-package-cache-update.yml"
+  roles:
+    - role: "{{ openstack_hosts_rolename | default('openstack_hosts') }}"
+  vars_files:
+    - test-vars.yml
diff --git a/test-prepare-host.yml b/test-prepare-host.yml
index 3e0438aa..7845ceff 100644
--- a/test-prepare-host.yml
+++ b/test-prepare-host.yml
@@ -16,12 +16,9 @@
 - name: Playbook for configuring the LXC host
   hosts: localhost
   pre_tasks:
+    - include: "common-tasks/test-force-package-cache-update.yml"
     - name: Clear iptables rules
       shell: "{{ playbook_dir }}/iptables-clear.sh"
-    - name: Update apt cache
-      apt:
-        update_cache: yes
-      when: ansible_os_family == 'Debian'
     - name: Ensure roots new public ssh key is in authorized_keys
       authorized_key:
         user: root