diff --git a/neutron/tests/base.py b/neutron/tests/base.py
index e3cd78b3895..31d3065f8f3 100644
--- a/neutron/tests/base.py
+++ b/neutron/tests/base.py
@@ -123,7 +123,10 @@ def setup_test_logging(config_opts, log_dir, log_file_path_template):
 
 def sanitize_log_path(path):
     # Sanitize the string so that its log path is shell friendly
-    return path.replace(' ', '-').replace('(', '_').replace(')', '_')
+    replace_map = {' ': '-', '(': '_', ')': '_'}
+    for s, r in six.iteritems(replace_map):
+        path = path.replace(s, r)
+    return path
 
 
 class AttributeDict(dict):
diff --git a/neutron/tests/fullstack/test_connectivity.py b/neutron/tests/fullstack/test_connectivity.py
index bb181db21f9..48edbc902b8 100644
--- a/neutron/tests/fullstack/test_connectivity.py
+++ b/neutron/tests/fullstack/test_connectivity.py
@@ -81,12 +81,14 @@ class TestOvsConnectivitySameNetwork(BaseConnectivitySameNetworkTest):
         ('VLANs', {'network_type': 'vlan',
                    'l2_pop': False})]
     interface_scenarios = [
-        ('openflow-cli', {'of_interface': 'ovs-ofctl',
-                          'ovsdb_interface': 'vsctl'}),
-        ('openflow-native', {'of_interface': 'native',
-                             'ovsdb_interface': 'vsctl'}),
-        ('ovsdb-native', {'of_interface': 'ovs-ofctl',
-                          'ovsdb_interface': 'native'})]
+        ('openflow-cli_ovsdb-cli', {'of_interface': 'ovs-ofctl',
+                                    'ovsdb_interface': 'vsctl'}),
+        ('openflow-native_ovsdb-cli', {'of_interface': 'native',
+                                       'ovsdb_interface': 'vsctl'}),
+        ('openflow-cli_ovsdb-native', {'of_interface': 'ovs-ofctl',
+                                       'ovsdb_interface': 'native'}),
+        ('openflow-native_ovsdb-native', {'of_interface': 'native',
+                                          'ovsdb_interface': 'native'})]
     scenarios = testscenarios.multiply_scenarios(
         network_scenarios, interface_scenarios)