diff --git a/unit_tests/charm_tests/test_tempest.py b/unit_tests/charm_tests/test_tempest.py
index 9c4fc9a..3c4c161 100644
--- a/unit_tests/charm_tests/test_tempest.py
+++ b/unit_tests/charm_tests/test_tempest.py
@@ -42,7 +42,7 @@ class TestTempestSetup(unittest.TestCase):
             'TEST_GATEWAY': 'test',
             'TEST_CIDR_EXT': 'test',
             'TEST_FIP_RANGE': 'test',
-            'TEST_NAMESERVER': 'test',
+            'TEST_NAME_SERVER': 'test',
             'TEST_CIDR_PRIV': 'test',
         }
         tempest_setup.add_environment_var_config(ctxt, ['neutron'])
@@ -55,7 +55,7 @@ class TestTempestSetup(unittest.TestCase):
         ctxt = {}
         get_deployment_context.return_value = {
             'TEST_GATEWAY': 'test',
-            'TEST_NAMESERVER': 'test',
+            'TEST_NAME_SERVER': 'test',
             'TEST_CIDR_PRIV': 'test',
         }
         with self.assertRaises(Exception) as context:
diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2 b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2
index 8c9b6c6..d4b8810 100644
--- a/zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2
+++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v2.j2
@@ -56,7 +56,7 @@ http_image = http://{{ test_swift_ip }}:80/swift/v1/images/cirros-0.3.4-x86_64-u
 project_network_cidr = {{ test_cidr_priv }}
 {% endif %}
 public_network_id = {{ ext_net }}
-dns_servers = {{ test_nameserver }}
+dns_servers = {{ test_name_server }}
 project_networks_reachable = false
 
 [network-feature-enabled]
diff --git a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2 b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
index fc92dd2..b441f2d 100644
--- a/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
+++ b/zaza/openstack/charm_tests/tempest/templates/tempest_v3.j2
@@ -58,7 +58,7 @@ http_image = http://{{ test_swift_ip }}:80/swift/v1/images/cirros-0.3.4-x86_64-u
 project_network_cidr = {{ test_cidr_priv }}
 {% endif %}
 public_network_id = {{ ext_net }}
-dns_servers = {{ test_nameserver }}
+dns_servers = {{ test_name_server }}
 project_networks_reachable = false
 floating_network_name = {{ ext_net }}