diff --git a/tests/host_vars/localhost.yml b/tests/host_vars/localhost.yml
index d600d435..5cdf3b2f 100644
--- a/tests/host_vars/localhost.yml
+++ b/tests/host_vars/localhost.yml
@@ -21,7 +21,7 @@ bridges:
     ip_addr: "10.1.1.1"
   - name: "br-vxlan"
     ip_addr: "10.1.2.1"
-  - name: "br-flat"
+  - name: "br-vlan"
     ip_addr: "10.1.3.1"
     veth_peer: "eth12"
   - name: "br-ipmi"
diff --git a/tests/host_vars/openstack1.yml b/tests/host_vars/openstack1.yml
index 627f2d15..8e80b538 100644
--- a/tests/host_vars/openstack1.yml
+++ b/tests/host_vars/openstack1.yml
@@ -45,7 +45,7 @@ container_networks:
     netmask: null
     type: "veth"
   flat_address:
-    bridge: "br-flat"
+    bridge: "br-vlan"
     interface: "eth12"
     netmask: null
     type: veth
diff --git a/tests/os_ironic-overrides.yml b/tests/os_ironic-overrides.yml
index 0e268ab6..9218ab93 100644
--- a/tests/os_ironic-overrides.yml
+++ b/tests/os_ironic-overrides.yml
@@ -36,3 +36,4 @@ ironic_neutron_provisioning_network_name: "ironic-prov"
 neutron_l3: True
 neutron_metadata: True
 ironic_pip_package_state: latest
+ironic_service_user_name: "ironic"