diff --git a/neutron/tests/tempest/config.py b/neutron/tests/tempest/config.py
index 08b235a..f50fa39 100644
--- a/neutron/tests/tempest/config.py
+++ b/neutron/tests/tempest/config.py
@@ -14,6 +14,7 @@
 
 from tempest import config
 
+
 CONF = config.CONF
 
 
@@ -27,3 +28,20 @@
 # transition to the Tempest plugin architecture
 for opt in NeutronPluginOptions:
     CONF.register_opt(opt, 'neutron_plugin_options')
+
+
+config_opts_translator = {
+    'project_network_cidr': 'tenant_network_cidr',
+    'project_network_v6_cidr': 'tenant_network_v6_cidr',
+    'project_network_mask_bits': 'tenant_network_mask_bits',
+    'project_network_v6_mask_bits': 'tenant_network_v6_mask_bits'}
+
+
+def safe_get_config_value(group, name):
+    """Safely get Oslo config opts from Tempest, using old and new names."""
+    conf_group = getattr(CONF, group)
+
+    try:
+        return getattr(conf_group, name)
+    except cfg.NoSuchOptError:
+        return getattr(conf_group, config_opts_translator[name])