diff --git a/nova_dpm/tests/unit/conf/test_cfg.py b/nova_dpm/tests/unit/conf/test_cfg.py
index 2391184..edb364d 100644
--- a/nova_dpm/tests/unit/conf/test_cfg.py
+++ b/nova_dpm/tests/unit/conf/test_cfg.py
@@ -67,7 +67,7 @@ class TestStorageAdapterMappingOpt(TestCase):
         mapping = ["aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:0"]
         opt = MultiStorageAdapterMappingOpt("mapping")
         cfg.CONF.register_opt(opt)
-        cfg.CONF.set_override("mapping", mapping, enforce_type=True)
+        cfg.CONF.set_override("mapping", mapping)
         self.assertEqual([("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "0")],
                          cfg.CONF.mapping)
 
@@ -76,7 +76,7 @@ class TestStorageAdapterMappingOpt(TestCase):
                    "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb:1"]
         opt = MultiStorageAdapterMappingOpt("mapping")
         cfg.CONF.register_opt(opt)
-        cfg.CONF.set_override("mapping", mapping, enforce_type=True)
+        cfg.CONF.set_override("mapping", mapping)
         expected_mapping = [
             ("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", "0"),
             ("bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb", "1")]
diff --git a/nova_dpm/tests/unit/virt/dpm/test_driver.py b/nova_dpm/tests/unit/virt/dpm/test_driver.py
index 5844338..2fd04f8 100644
--- a/nova_dpm/tests/unit/virt/dpm/test_driver.py
+++ b/nova_dpm/tests/unit/virt/dpm/test_driver.py
@@ -113,7 +113,7 @@ class DPMdriverInitHostTestCase(TestCase):
 
         storage = self.adapter_object_id + ":" + self.port_element_id
         cfg.CONF.set_override("physical_storage_adapter_mappings", [storage],
-                              group="dpm", enforce_type=True)
+                              group="dpm")
 
         self.flags(
             group="dpm",
diff --git a/nova_dpm/tests/unit/virt/dpm/test_vm.py b/nova_dpm/tests/unit/virt/dpm/test_vm.py
index a3cd892..9ff8775 100755
--- a/nova_dpm/tests/unit/virt/dpm/test_vm.py
+++ b/nova_dpm/tests/unit/virt/dpm/test_vm.py
@@ -122,7 +122,7 @@ class VmPartitionInstanceTestCase(TestCase):
             'element-id')
         storage = self.adapter_object_id + ":" + self.port_element_id
         cfg.CONF.set_override("physical_storage_adapter_mappings", [storage],
-                              group="dpm", enforce_type=True)
+                              group="dpm")
         dpm_hba_dict = {
             "name": "OpenStack_Port_" + self.adapter_object_id +
                     "_" + str(self.port_element_id),