diff --git a/tests/host_vars/compute1.yml b/tests/host_vars/compute1.yml
new file mode 100644
index 00000000..590802fa
--- /dev/null
+++ b/tests/host_vars/compute1.yml
@@ -0,0 +1,17 @@
+---
+# 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.1.1
+neutron_local_ip:  10.1.2.1
diff --git a/tests/host_vars/localhost.yml b/tests/host_vars/localhost.yml
index 05d187cb..0ff43895 100644
--- a/tests/host_vars/localhost.yml
+++ b/tests/host_vars/localhost.yml
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-neutron_local_ip:  10.1.2.1
-ansible_python_interpreter: "/usr/bin/python2"
 bridges:
   - name: "br-mgmt"
     ip_addr: "10.1.1.1"
diff --git a/tests/inventory b/tests/inventory
index a3dd94cb..3485d877 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -4,6 +4,7 @@ infra1
 openstack1
 swift-storage1
 octavia1
+compute1
 
 [all_containers]
 infra1
@@ -69,8 +70,7 @@ openstack1
 openstack1
 
 [neutron_linuxbridge_agent]
-openstack1
-localhost
+compute1
 
 [neutron_openvswitch_agent]
 
@@ -109,7 +109,7 @@ openstack1
 openstack1
 
 [nova_compute]
-localhost
+compute1
 
 [nova_conductor]
 openstack1