diff --git a/unit_tests/utilities/test_zaza_utilities_generic.py b/unit_tests/utilities/test_zaza_utilities_generic.py
index 4aa73f6..f2b3365 100644
--- a/unit_tests/utilities/test_zaza_utilities_generic.py
+++ b/unit_tests/utilities/test_zaza_utilities_generic.py
@@ -125,23 +125,30 @@ class TestGenericUtils(ut_utils.BaseTestCase):
             return _env.get(key)
         self.get.side_effect = _get_env
 
-        # OSCI backward compatible env vars
+        # Prefered OSCI TEST_ env vars
         _env = {"NET_ID": "netid",
                 "NAMESERVER": "10.0.0.10",
                 "GATEWAY": "10.0.0.1",
                 "CIDR_EXT": "10.0.0.0/24",
-                "FIP_RANGE": "10.0.200.0:10.0.200.254"}
+                "FIP_RANGE": "10.0.200.0:10.0.200.254",
+                "TEST_NET_ID": "test_netid",
+                "TEST_NAMESERVER": "10.9.0.10",
+                "TEST_GATEWAY": "10.9.0.1",
+                "TEST_CIDR_EXT": "10.9.0.0/24",
+                "TEST_FIP_RANGE": "10.9.200.0:10.0.200.254"}
         _expected_result = {}
-        _expected_result["net_id"] = _env["NET_ID"]
-        _expected_result["external_dns"] = _env["NAMESERVER"]
-        _expected_result["default_gateway"] = _env["GATEWAY"]
-        _expected_result["external_net_cidr"] = _env["CIDR_EXT"]
-        _expected_result["start_floating_ip"] = _env["FIP_RANGE"].split(":")[0]
-        _expected_result["end_floating_ip"] = _env["FIP_RANGE"].split(":")[1]
+        _expected_result["net_id"] = _env["TEST_NET_ID"]
+        _expected_result["external_dns"] = _env["TEST_NAMESERVER"]
+        _expected_result["default_gateway"] = _env["TEST_GATEWAY"]
+        _expected_result["external_net_cidr"] = _env["TEST_CIDR_EXT"]
+        _expected_result["start_floating_ip"] = _env[
+            "TEST_FIP_RANGE"].split(":")[0]
+        _expected_result["end_floating_ip"] = _env[
+            "TEST_FIP_RANGE"].split(":")[1]
         self.assertEqual(generic_utils.get_undercloud_env_vars(),
                          _expected_result)
 
-        # Overriding configure.network named variables
+        # Overriding local configure.network named variables
         _override = {"start_floating_ip": "10.100.50.0",
                      "end_floating_ip": "10.100.50.254",
                      "default_gateway": "10.100.0.1",
diff --git a/zaza/openstack/utilities/generic.py b/zaza/openstack/utilities/generic.py
index 856e036..e04ae34 100644
--- a/zaza/openstack/utilities/generic.py
+++ b/zaza/openstack/utilities/generic.py
@@ -139,21 +139,24 @@ def get_undercloud_env_vars():
     :returns: Network environment variables
     :rtype: dict
     """
-    # Handle backward compatibile OSCI enviornment variables
+    # Handle OSCI environment variables
+    # Note: TEST_* is the only prefix honored
     _vars = {}
-    _vars['net_id'] = os.environ.get('NET_ID')
-    _vars['external_dns'] = os.environ.get('NAMESERVER')
-    _vars['default_gateway'] = os.environ.get('GATEWAY')
-    _vars['external_net_cidr'] = os.environ.get('CIDR_EXT')
+    _vars['net_id'] = os.environ.get('TEST_NET_ID')
+    _vars['external_dns'] = os.environ.get('TEST_NAMESERVER')
+    _vars['default_gateway'] = os.environ.get('TEST_GATEWAY')
+    _vars['external_net_cidr'] = os.environ.get('TEST_CIDR_EXT')
 
     # Take FIP_RANGE and create start and end floating ips
-    _fip_range = os.environ.get('FIP_RANGE')
-    if _fip_range and ':' in _fip_range:
-        _vars['start_floating_ip'] = os.environ.get('FIP_RANGE').split(':')[0]
-        _vars['end_floating_ip'] = os.environ.get('FIP_RANGE').split(':')[1]
+    _fip_range = os.environ.get('TEST_FIP_RANGE')
+    if _fip_range is not None and ':' in _fip_range:
+        _vars['start_floating_ip'] = os.environ.get(
+            'TEST_FIP_RANGE').split(':')[0]
+        _vars['end_floating_ip'] = os.environ.get(
+            'TEST_FIP_RANGE').split(':')[1]
 
-    # Env var naming consistent with zaza.openstack.configure.network
-    # functions takes priority. Override backward compatible settings.
+    # zaza.openstack.configure.network functions variables still take priority
+    # for local testing. Override OSCI settings.
     _keys = ['default_gateway',
              'start_floating_ip',
              'end_floating_ip',