diff --git a/tripleoclient/tests/v1/undercloud/test_config.py b/tripleoclient/tests/v1/undercloud/test_config.py
index 64d20f6dd..583738ef0 100644
--- a/tripleoclient/tests/v1/undercloud/test_config.py
+++ b/tripleoclient/tests/v1/undercloud/test_config.py
@@ -48,7 +48,7 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
         undercloud_config._process_drivers_and_hardware_types(self.conf, env)
         self.assertEqual({
             'IronicEnabledHardwareTypes': ['idrac', 'ilo', 'ipmi', 'redfish'],
-            'IronicEnabledBootInterfaces': ['ilo-pxe', 'pxe'],
+            'IronicEnabledBootInterfaces': ['ilo-pxe', 'ipxe', 'pxe'],
             'IronicEnabledManagementInterfaces': ['fake', 'idrac', 'ilo',
                                                   'ipmitool', 'noop',
                                                   'redfish'],
@@ -67,7 +67,7 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
         self.assertEqual({
             # ipmi added because it's the default discovery driver
             'IronicEnabledHardwareTypes': ['ipmi', 'redfish'],
-            'IronicEnabledBootInterfaces': ['pxe'],
+            'IronicEnabledBootInterfaces': ['ipxe', 'pxe'],
             'IronicEnabledManagementInterfaces': ['fake', 'ipmitool',
                                                   'noop', 'redfish'],
             'IronicEnabledPowerInterfaces': ['fake', 'ipmitool', 'redfish'],
@@ -93,7 +93,8 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
                                            'idrac', 'ilo', 'ipmi', 'irmc',
                                            'redfish', 'snmp', 'staging-ovirt',
                                            'xclarity'],
-            'IronicEnabledBootInterfaces': ['ilo-pxe', 'irmc-pxe', 'pxe'],
+            'IronicEnabledBootInterfaces': ['ilo-pxe', 'ipxe', 'irmc-pxe',
+                                            'pxe'],
             'IronicEnabledManagementInterfaces': ['cimc', 'fake', 'idrac',
                                                   'ilo', 'ipmitool', 'irmc',
                                                   'noop', 'redfish',
diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py
index 93a2cb04d..dd1368308 100644
--- a/tripleoclient/v1/undercloud_config.py
+++ b/tripleoclient/v1/undercloud_config.py
@@ -155,7 +155,7 @@ def _process_drivers_and_hardware_types(conf, env):
             mgmt_interfaces.add(iface)
 
     # Two hardware types use non-default boot interfaces.
-    boot_interfaces = {'pxe'}
+    boot_interfaces = {'ipxe', 'pxe'}
     for hw_type in ('ilo', 'irmc'):
         if hw_type in enabled_hardware_types:
             boot_interfaces.add('%s-pxe' % hw_type)