diff --git a/tests/host_vars/infra1.yml b/tests/host_vars/infra1.yml
new file mode 100644
index 00000000..86d45ff8
--- /dev/null
+++ b/tests/host_vars/infra1.yml
@@ -0,0 +1,18 @@
+---
+# 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.
+
+ansible_host: 10.1.0.2
+ansible_become: True
+ansible_user: root
diff --git a/tests/host_vars/keystone1.yml b/tests/host_vars/keystone1.yml
new file mode 100644
index 00000000..23b94986
--- /dev/null
+++ b/tests/host_vars/keystone1.yml
@@ -0,0 +1,18 @@
+---
+# 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.
+
+ansible_host: 10.1.0.3
+ansible_become: True
+ansible_user: root
diff --git a/tests/host_vars/keystone2.yml b/tests/host_vars/keystone2.yml
new file mode 100644
index 00000000..0e876f60
--- /dev/null
+++ b/tests/host_vars/keystone2.yml
@@ -0,0 +1,18 @@
+---
+# 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.
+
+ansible_host: 10.1.0.4
+ansible_become: True
+ansible_user: root
diff --git a/tests/inventory b/tests/inventory
index 10b8a9fa..9dbe0428 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -1,8 +1,8 @@
 [all]
-localhost ansible_become=True
-infra1 ansible_host=10.1.0.2 ansible_become=True ansible_user=root
-keystone1 ansible_host=10.1.0.3 ansible_become=True ansible_user=root
-keystone2 ansible_host=10.1.0.4 ansible_become=True ansible_user=root
+localhost
+infra1
+keystone1
+keystone2
 
 [all_containers]
 infra1
diff --git a/tests/test-benchmark-keystone-upgrade-results.yml b/tests/test-benchmark-keystone-upgrade-results.yml
index 2b787e4e..ea6a537b 100644
--- a/tests/test-benchmark-keystone-upgrade-results.yml
+++ b/tests/test-benchmark-keystone-upgrade-results.yml
@@ -16,6 +16,7 @@
 - name: Playbook for deploying upgrade benchmarking
   hosts: localhost
   user: root
+  become: true
   tasks:
     - name: Kill upgrade benchmarking process
       command: pkill locust
diff --git a/tests/test-benchmark-keystone-upgrade.yml b/tests/test-benchmark-keystone-upgrade.yml
index 30b88920..7cfdb342 100644
--- a/tests/test-benchmark-keystone-upgrade.yml
+++ b/tests/test-benchmark-keystone-upgrade.yml
@@ -16,6 +16,7 @@
 - name: Playbook for deploying upgrade benchmarking
   hosts: localhost
   user: root
+  become: true
   tasks:
     - name: Install locust
       pip:
diff --git a/tests/test-clone-repo.yml b/tests/test-clone-repo.yml
index 75419c48..d5a3e800 100644
--- a/tests/test-clone-repo.yml
+++ b/tests/test-clone-repo.yml
@@ -16,6 +16,7 @@
 - name: Clone keystone repository if it doesn't exist
   hosts: localhost
   user: root
+  become: true
   pre_tasks:
     - name: Clone the repo
       git:
diff --git a/tests/test-install-haproxy.yml b/tests/test-install-haproxy.yml
index f4b9a39b..f5458174 100644
--- a/tests/test-install-haproxy.yml
+++ b/tests/test-install-haproxy.yml
@@ -15,6 +15,7 @@
 
 - name: Install haproxy
   hosts: localhost
+  become: true
   roles:
     - role: "haproxy_server"
       haproxy_service_configs: "{{ haproxy_default_services }}"