diff --git a/tests/inventory b/tests/inventory
index 9dbe0428..c8fe17c0 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -30,5 +30,8 @@ keystone2
 [utility_all]
 keystone1
 
-[haproxy_all]
+[haproxy_all:children]
+haproxy
+
+[haproxy]
 localhost
diff --git a/tests/os_keystone-overrides.yml b/tests/os_keystone-overrides.yml
index 0c8dfae0..5f91083d 100644
--- a/tests/os_keystone-overrides.yml
+++ b/tests/os_keystone-overrides.yml
@@ -28,7 +28,7 @@ tempest_test_whitelist:
 
 external_lb_vip_address: 10.1.0.1
 internal_lb_vip_address: 10.1.0.1
-test_keystone_host: "{{ (keystone_upgrade is defined) | ternary(external_lb_vip_address, hostvars[groups[test_keystone_group][0]]['ansible_host']) }}"
+test_keystone_host: "{{ external_lb_vip_address }}"
 
 # For upgrades we need haproxy variables
 haproxy_default_services:
diff --git a/tests/test-install-haproxy.yml b/tests/test-install-haproxy.yml
deleted file mode 100644
index f5458174..00000000
--- a/tests/test-install-haproxy.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# Copyright 2017, 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: Install haproxy
-  hosts: localhost
-  become: true
-  roles:
-    - role: "haproxy_server"
-      haproxy_service_configs: "{{ haproxy_default_services }}"
-  vars_files:
-    - os_keystone-overrides.yml
diff --git a/tests/test-upgrade-pre.yml b/tests/test-upgrade-pre.yml
index 76c36eea..29e8043b 100644
--- a/tests/test-upgrade-pre.yml
+++ b/tests/test-upgrade-pre.yml
@@ -26,7 +26,7 @@
 - include: common/test-prepare-containers.yml
 
 # Install haproxy
-- include: test-install-haproxy.yml
+- include: common/test-install-haproxy.yml
 
 # Install RabbitMQ/MariaDB
 - include: common/test-install-infra.yml
diff --git a/tests/test.yml b/tests/test.yml
index d506503d..cb269c19 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -22,6 +22,9 @@
 # Prepare the containers
 - include: common/test-prepare-containers.yml
 
+# Install haproxy
+- include: common/test-install-haproxy.yml
+
 # Install RabbitMQ/MariaDB
 - include: common/test-install-infra.yml