diff --git a/ironic_python_agent/hardware.py b/ironic_python_agent/hardware.py
index 5e178f164..18e752eb0 100644
--- a/ironic_python_agent/hardware.py
+++ b/ironic_python_agent/hardware.py
@@ -138,7 +138,8 @@ class HardwareType(object):
 
 class BlockDevice(encoding.SerializableComparable):
     serializable_fields = ('name', 'model', 'size', 'rotational',
-                           'wwn', 'serial', 'vendor')
+                           'wwn', 'serial', 'vendor', 'wwn_with_extension',
+                           'wwn_vendor_extension')
 
     def __init__(self, name, model, size, rotational, wwn=None, serial=None,
                  vendor=None, wwn_with_extension=None,
diff --git a/ironic_python_agent/tests/unit/test_hardware.py b/ironic_python_agent/tests/unit/test_hardware.py
index 0424e625d..cfbe2cb51 100644
--- a/ironic_python_agent/tests/unit/test_hardware.py
+++ b/ironic_python_agent/tests/unit/test_hardware.py
@@ -319,6 +319,8 @@ class TestGenericHardwareManager(test_base.BaseTestCase):
                                  rotational=False,
                                  vendor='Super Vendor',
                                  wwn='wwn0',
+                                 wwn_with_extension='wwn0ven0',
+                                 wwn_vendor_extension='ven0',
                                  serial='serial0'),
             hardware.BlockDevice(name='/dev/sdb',
                                  model=model,
@@ -326,6 +328,8 @@ class TestGenericHardwareManager(test_base.BaseTestCase):
                                  rotational=False,
                                  vendor='fake-vendor',
                                  wwn='fake-wwn',
+                                 wwn_with_extension='fake-wwnven0',
+                                 wwn_vendor_extension='ven0',
                                  serial='fake-serial'),
         ]
 
diff --git a/ironic_python_agent/tests/unit/test_ironic_api_client.py b/ironic_python_agent/tests/unit/test_ironic_api_client.py
index a197e08f3..bd534a127 100644
--- a/ironic_python_agent/tests/unit/test_ironic_api_client.py
+++ b/ironic_python_agent/tests/unit/test_ironic_api_client.py
@@ -175,6 +175,8 @@ class TestBaseIronicPythonAgent(test_base.BaseTestCase):
                     u'size': u'9001',
                     u'serial': None,
                     u'wwn': None,
+                    u'wwn_with_extension': None,
+                    u'wwn_vendor_extension': None,
                     u'vendor': None,
                 },
                 {
@@ -184,6 +186,8 @@ class TestBaseIronicPythonAgent(test_base.BaseTestCase):
                     u'size': u'9002',
                     u'serial': None,
                     u'wwn': None,
+                    u'wwn_with_extension': None,
+                    u'wwn_vendor_extension': None,
                     u'vendor': None,
                 }
             ],
@@ -306,6 +310,8 @@ class TestBaseIronicPythonAgent(test_base.BaseTestCase):
                     u'size': u'9001',
                     u'serial': None,
                     u'wwn': None,
+                    u'wwn_with_extension': None,
+                    u'wwn_vendor_extension': None,
                     u'vendor': None,
                 },
                 {
@@ -315,6 +321,8 @@ class TestBaseIronicPythonAgent(test_base.BaseTestCase):
                     u'size': u'9002',
                     u'serial': None,
                     u'wwn': None,
+                    u'wwn_with_extension': None,
+                    u'wwn_vendor_extension': None,
                     u'vendor': None,
                 }
             ],