diff --git a/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py b/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py
index fb3ab3d4a..8af037ded 100644
--- a/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py
+++ b/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py
@@ -605,14 +605,8 @@ class TestUploadOvercloudImageFullMultiArch(TestPluginV1):
     # reading logfiles a little nicer
     images = [
         mock.Mock(id=10, name='overcloud-full'),
-        mock.Mock(id=11, name='bm-deploy-kernel'),
-        mock.Mock(id=12, name='bm-deploy-initrd'),
-        mock.Mock(id=13, name='ppc64le-overcloud-full'),
-        mock.Mock(id=14, name='ppc64le-bm-deploy-kernel'),
-        mock.Mock(id=15, name='ppc64le-bm-deploy-initrd'),
-        mock.Mock(id=16, name='p9-ppc64le-overcloud-full'),
-        mock.Mock(id=17, name='p9-ppc64le-bm-deploy-kernel'),
-        mock.Mock(id=18, name='p9-ppc64le-bm-deploy-initrd'),
+        mock.Mock(id=11, name='ppc64le-overcloud-full'),
+        mock.Mock(id=12, name='p9-ppc64le-overcloud-full'),
     ]
 
     def setUp(self):
diff --git a/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py b/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py
index 9144b18ee..ae456bd53 100644
--- a/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py
+++ b/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py
@@ -789,9 +789,11 @@ class TestConfigureNode(fakes.TestOvercloudNode):
         # Get the command object to test
         self.cmd = overcloud_node.ConfigureNode(self.app, None)
 
+        self.http_boot = '/var/lib/ironic/httpboot'
+
         self.workflow_input = {
-            'kernel_name': 'file:///var/lib/ironic/httpboot/agent.kernel',
-            'ramdisk_name': 'file:///var/lib/ironic/httpboot/agent.ramdisk',
+            'kernel_name': 'file://%s/agent.kernel' % self.http_boot,
+            'ramdisk_name': 'file://%s/agent.ramdisk' % self.http_boot,
             'instance_boot_option': None,
             'root_device': None,
             'root_device_minimum_size': 4,
@@ -972,6 +974,8 @@ class TestDiscoverNode(fakes.TestOvercloudNode):
             "execution_id": "IDID"
         }]
 
+        self.http_boot = '/var/lib/ironic/httpboot'
+
     def test_with_ip_range(self):
         argslist = ['--range', '10.0.0.0/24',
                     '--credentials', 'admin:password']
@@ -983,11 +987,13 @@ class TestDiscoverNode(fakes.TestOvercloudNode):
 
         self.workflow.executions.create.assert_called_once_with(
             'tripleo.baremetal.v1.discover_and_enroll_nodes',
-            workflow_input={'ip_addresses': '10.0.0.0/24',
-                            'credentials': [['admin', 'password']],
-                            'kernel_name': 'bm-deploy-kernel',
-                            'ramdisk_name': 'bm-deploy-ramdisk',
-                            'instance_boot_option': 'local'}
+            workflow_input={
+                'ip_addresses': '10.0.0.0/24',
+                'credentials': [['admin', 'password']],
+                'kernel_name': 'file://%s/agent.kernel' % self.http_boot,
+                'ramdisk_name': 'file://%s/agent.ramdisk' % self.http_boot,
+                'instance_boot_option': 'local'
+            }
         )
 
     def test_with_address_list(self):
@@ -1001,11 +1007,13 @@ class TestDiscoverNode(fakes.TestOvercloudNode):
 
         self.workflow.executions.create.assert_called_once_with(
             'tripleo.baremetal.v1.discover_and_enroll_nodes',
-            workflow_input={'ip_addresses': ['10.0.0.1', '10.0.0.2'],
-                            'credentials': [['admin', 'password']],
-                            'kernel_name': 'bm-deploy-kernel',
-                            'ramdisk_name': 'bm-deploy-ramdisk',
-                            'instance_boot_option': 'local'}
+            workflow_input={
+                'ip_addresses': ['10.0.0.1', '10.0.0.2'],
+                'credentials': [['admin', 'password']],
+                'kernel_name': 'file://%s/agent.kernel' % self.http_boot,
+                'ramdisk_name': 'file://%s/agent.ramdisk' % self.http_boot,
+                'instance_boot_option': 'local'
+            }
         )
 
     def test_with_all_options(self):
diff --git a/tripleoclient/v1/overcloud_node.py b/tripleoclient/v1/overcloud_node.py
index 901e4cfb8..1dc16d459 100644
--- a/tripleoclient/v1/overcloud_node.py
+++ b/tripleoclient/v1/overcloud_node.py
@@ -451,8 +451,12 @@ class DiscoverNode(command.Command):
             deploy_kernel = None
             deploy_ramdisk = None
         else:
-            deploy_kernel = 'bm-deploy-kernel'
-            deploy_ramdisk = 'bm-deploy-ramdisk'
+            deploy_kernel = 'file://{}/agent.kernel'.format(
+                    constants.IRONIC_HTTP_BOOT_BIND_MOUNT
+            )
+            deploy_ramdisk = 'file://{}/agent.ramdisk'.format(
+                    constants.IRONIC_HTTP_BOOT_BIND_MOUNT
+            )
 
         credentials = [list(x.split(':', 1)) for x in parsed_args.credentials]
         kwargs = {}