diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 429646ecf..f0a12b530 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -304,6 +304,11 @@ if [ "$MULTINODE" == 0 ] && [ "$OVERCLOUD" == 1 ] ; then
     if [ $PREDICTABLE_PLACEMENT == 1 ]; then
         # Verify our public VIP is the one we specified
         grep -q 10.0.0.9 ~/overcloudrc || (echo "Wrong public vip deployed " && exit 1)
+        # Verify our specified hostnames were used
+        nova list | grep -q controller-0-tripleo-ci-a-foo
+        nova list | grep -q controller-1-tripleo-ci-b-bar
+        nova list | grep -q controller-2-tripleo-ci-c-baz
+        nova list | grep -q compute-0-tripleo-ci-a-test
     fi
 
     if [ $PACEMAKER == 1 ] ; then
diff --git a/test-environments/hostname-map.yaml b/test-environments/hostname-map.yaml
new file mode 100644
index 000000000..d15e6f973
--- /dev/null
+++ b/test-environments/hostname-map.yaml
@@ -0,0 +1,6 @@
+parameter_defaults:
+  HostnameMap:
+    overcloud-controller-0: controller-0-tripleo-ci-a-foo
+    overcloud-controller-1: controller-1-tripleo-ci-b-bar
+    overcloud-controller-2: controller-2-tripleo-ci-c-baz
+    overcloud-novacompute-0: compute-0-tripleo-ci-a-test
diff --git a/toci_gate_test.sh b/toci_gate_test.sh
index b61ea273b..53cbe8c91 100755
--- a/toci_gate_test.sh
+++ b/toci_gate_test.sh
@@ -187,7 +187,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
             # In ci our overcloud nodes don't have access to an external netwrok
             # --ntp-server is here to make the deploy command happy, the ci env
             # is on virt so the clocks should be in sync without it.
-            OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --control-scale 3 --ntp-server 0.centos.pool.ntp.org -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/network-templates/network-environment.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/net-iso.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/ips-from-pool-all.yaml"
+            OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --control-scale 3 --ntp-server 0.centos.pool.ntp.org -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/network-templates/network-environment.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/net-iso.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/ips-from-pool-all.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/hostname-map.yaml"
             NETISO_V4=1
             PACEMAKER=1
             PREDICTABLE_PLACEMENT=1