diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml
index 246227c..edfd38e 100644
--- a/tests/group_vars/all_containers.yml
+++ b/tests/group_vars/all_containers.yml
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-container_name: "{{ inventory_hostname }}"
 container_networks:
   management_address:
     address: "{{ ansible_host }}"
diff --git a/tests/host_vars/container1.yml b/tests/host_vars/container1.yml
index d0c0b93..9bd045e 100644
--- a/tests/host_vars/container1.yml
+++ b/tests/host_vars/container1.yml
@@ -16,3 +16,4 @@
 ansible_host: 10.1.0.2
 ansible_become: True
 ansible_user: root
+container_name: container1
diff --git a/tests/host_vars/container2.yml b/tests/host_vars/container2.yml
index 9c73136..f315567 100644
--- a/tests/host_vars/container2.yml
+++ b/tests/host_vars/container2.yml
@@ -16,3 +16,4 @@
 ansible_host: 10.1.0.3
 ansible_become: True
 ansible_user: root
+container_name: container2
diff --git a/tests/host_vars/container3.yml b/tests/host_vars/container3.yml
index 8e87110..9f69ce1 100644
--- a/tests/host_vars/container3.yml
+++ b/tests/host_vars/container3.yml
@@ -16,3 +16,4 @@
 ansible_host: 10.1.0.4
 ansible_become: True
 ansible_user: root
+container_name: container3
diff --git a/tests/host_vars/container4.yml b/tests/host_vars/container4.yml
deleted file mode 100644
index 0787a26..0000000
--- a/tests/host_vars/container4.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# Copyright 2018, 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.5
-ansible_become: True
-ansible_user: root