diff --git a/nova_dpm/tests/unit/virt/dpm/test_vm.py b/nova_dpm/tests/unit/virt/dpm/test_vm.py
index ceeaa65..cf3b634 100755
--- a/nova_dpm/tests/unit/virt/dpm/test_vm.py
+++ b/nova_dpm/tests/unit/virt/dpm/test_vm.py
@@ -310,9 +310,8 @@ class VmPartitionInstanceTestCase(TestCase):
                                               'wwpn': wwpn}[prop]
         mock_get_hba.return_value = mock_hba
 
-        bdm = [BLOCK_DEVICE]
-
-        self.partition_inst.set_boot_properties(bdm)
+        self.partition_inst.block_device_info = [BLOCK_DEVICE]
+        self.partition_inst.set_boot_properties()
 
         mock_gtw.assert_called_once_with(wwpn)
 
diff --git a/nova_dpm/virt/dpm/vm.py b/nova_dpm/virt/dpm/vm.py
index 4bd6609..3bfacfd 100644
--- a/nova_dpm/virt/dpm/vm.py
+++ b/nova_dpm/virt/dpm/vm.py
@@ -314,13 +314,16 @@ class PartitionInstance(object):
                 partition_wwpns.append(wwpn.replace('0x', ''))
         return partition_wwpns
 
-    def set_boot_properties(self, bdm):
+    def _get_boot_bd(self):
+        # block_device_info is a list of block devices.
+        # In DPM case we are mapping only the first device for now.
+        # TODO(andreas_s): Need to check whether this bd is marked as bootable
+        return BlockDevice(self.block_device_info[0])
+
+    def set_boot_properties(self):
         LOG.debug('set_boot_properties')
-        # block_device_mapping is a list of mapped block devices.
-        # In dpm case we are mapping only the first device for now
-        # So block_device_mapping contains one item in the list
-        # i.e. block_device_mapping[0]
-        bd = BlockDevice(bdm[0])
+
+        bd = self._get_boot_bd()
 
         boot_hba = self.get_boot_hba()
         boot_properties = {