diff --git a/ironic/tests/unit/drivers/modules/test_ipxe.py b/ironic/tests/unit/drivers/modules/test_ipxe.py
index 56c35952c0..133343639d 100644
--- a/ironic/tests/unit/drivers/modules/test_ipxe.py
+++ b/ironic/tests/unit/drivers/modules/test_ipxe.py
@@ -233,7 +233,8 @@ class iPXEBootTestCase(db_base.DbTestCase):
                               ipxe_use_swift=False,
                               whole_disk_image=False,
                               mode='deploy',
-                              node_boot_mode=None):
+                              node_boot_mode=None,
+                              persistent=False):
         mock_build_pxe.return_value = {}
         kernel_label = '%s_kernel' % mode
         ramdisk_label = '%s_ramdisk' % mode
@@ -266,7 +267,7 @@ class iPXEBootTestCase(db_base.DbTestCase):
                 get_boot_mode_mock.assert_called_once_with(task)
             set_boot_device_mock.assert_called_once_with(task,
                                                          boot_devices.PXE,
-                                                         persistent=False)
+                                                         persistent=persistent)
             if ipxe_use_swift:
                 if whole_disk_image:
                     self.assertFalse(mock_cache_r_k.called)
@@ -306,6 +307,22 @@ class iPXEBootTestCase(db_base.DbTestCase):
         self.node.save()
         self._test_prepare_ramdisk()
 
+    def test_prepare_ramdisk_force_persistent_boot_device_enabled(self):
+        self.node.provision_state = states.DEPLOYING
+        driver_info = self.node.driver_info
+        driver_info['force_persistent_boot_device'] = True
+        self.node.driver_info = driver_info
+        self.node.save()
+        self._test_prepare_ramdisk(persistent=True)
+
+    def test_prepare_ramdisk_force_persistent_boot_device_disabled(self):
+        self.node.provision_state = states.DEPLOYING
+        driver_info = self.node.driver_info
+        driver_info['force_persistent_boot_device'] = False
+        self.node.driver_info = driver_info
+        self.node.save()
+        self._test_prepare_ramdisk()
+
     def test_prepare_ramdisk_rescue(self):
         self.node.provision_state = states.RESCUING
         self.node.save()
@@ -736,25 +753,6 @@ class iPXEBootTestCase(db_base.DbTestCase):
                                                          boot_devices.DISK,
                                                          persistent=True)
 
-    @mock.patch.object(manager_utils, 'node_set_boot_device', autospec=True)
-    @mock.patch.object(pxe_utils, 'clean_up_pxe_config', autospec=True)
-    def test_is_force_persistent_boot_device_enabled(
-            self, clean_up_pxe_config_mock, set_boot_device_mock):
-        with task_manager.acquire(self.context, self.node.uuid) as task:
-            instance_info = task.node.instance_info
-            instance_info['capabilities'] = {'boot_option': 'local'}
-            task.node.instance_info = instance_info
-            task.node.save()
-            task.driver.boot.prepare_instance(task)
-            clean_up_pxe_config_mock.assert_called_once_with(
-                task, ipxe_enabled=True)
-            driver_info = task.node.driver_info
-            driver_info['force_persistent _boot_device'] = True
-            task.node.driver_info = driver_info
-            set_boot_device_mock.assert_called_once_with(task,
-                                                         boot_devices.DISK,
-                                                         persistent=True)
-
     @mock.patch.object(manager_utils, 'node_set_boot_device', autospec=True)
     @mock.patch.object(pxe_utils, 'clean_up_pxe_config', autospec=True)
     def test_prepare_instance_localboot_active(self, clean_up_pxe_config_mock,
diff --git a/ironic/tests/unit/drivers/modules/test_pxe.py b/ironic/tests/unit/drivers/modules/test_pxe.py
index 9c37a6e973..7121fc18ff 100644
--- a/ironic/tests/unit/drivers/modules/test_pxe.py
+++ b/ironic/tests/unit/drivers/modules/test_pxe.py
@@ -231,7 +231,8 @@ class PXEBootTestCase(db_base.DbTestCase):
                               ipxe_use_swift=False,
                               whole_disk_image=False,
                               mode='deploy',
-                              node_boot_mode=None):
+                              node_boot_mode=None,
+                              persistent=False):
         mock_build_pxe.return_value = {}
         kernel_label = '%s_kernel' % mode
         ramdisk_label = '%s_ramdisk' % mode
@@ -264,7 +265,7 @@ class PXEBootTestCase(db_base.DbTestCase):
                 get_boot_mode_mock.assert_called_once_with(task)
             set_boot_device_mock.assert_called_once_with(task,
                                                          boot_devices.PXE,
-                                                         persistent=False)
+                                                         persistent=persistent)
             if ipxe_use_swift:
                 if whole_disk_image:
                     self.assertFalse(mock_cache_r_k.called)
@@ -305,6 +306,22 @@ class PXEBootTestCase(db_base.DbTestCase):
         self.node.save()
         self._test_prepare_ramdisk()
 
+    def test_prepare_ramdisk_force_persistent_boot_device_enabled(self):
+        self.node.provision_state = states.DEPLOYING
+        driver_info = self.node.driver_info
+        driver_info['force_persistent_boot_device'] = True
+        self.node.driver_info = driver_info
+        self.node.save()
+        self._test_prepare_ramdisk(persistent=True)
+
+    def test_prepare_ramdisk_force_persistent_boot_device_disabled(self):
+        self.node.provision_state = states.DEPLOYING
+        driver_info = self.node.driver_info
+        driver_info['force_persistent_boot_device'] = False
+        self.node.driver_info = driver_info
+        self.node.save()
+        self._test_prepare_ramdisk()
+
     def test_prepare_ramdisk_rescue(self):
         self.node.provision_state = states.RESCUING
         self.node.save()
@@ -738,25 +755,6 @@ class PXEBootTestCase(db_base.DbTestCase):
                                                          boot_devices.DISK,
                                                          persistent=True)
 
-    @mock.patch.object(manager_utils, 'node_set_boot_device', autospec=True)
-    @mock.patch.object(pxe_utils, 'clean_up_pxe_config', autospec=True)
-    def test_is_force_persistent_boot_device_enabled(
-            self, clean_up_pxe_config_mock, set_boot_device_mock):
-        with task_manager.acquire(self.context, self.node.uuid) as task:
-            instance_info = task.node.instance_info
-            instance_info['capabilities'] = {'boot_option': 'local'}
-            task.node.instance_info = instance_info
-            task.node.save()
-            task.driver.boot.prepare_instance(task)
-            clean_up_pxe_config_mock.assert_called_once_with(
-                task, ipxe_enabled=CONF.pxe.ipxe_enabled)
-            driver_info = task.node.driver_info
-            driver_info['force_persistent _boot_device'] = True
-            task.node.driver_info = driver_info
-            set_boot_device_mock.assert_called_once_with(task,
-                                                         boot_devices.DISK,
-                                                         persistent=True)
-
     @mock.patch.object(manager_utils, 'node_set_boot_device', autospec=True)
     @mock.patch.object(pxe_utils, 'clean_up_pxe_config', autospec=True)
     def test_prepare_instance_localboot_active(self, clean_up_pxe_config_mock,