diff --git a/src/device/tests/Device_Emulated.py b/src/device/tests/Device_Emulated.py
index c8453486f6c3b056c27d2b0ab60e0649f08e34e1..62a94c8a85172b1af90e2e347e0692bf5b79598e 100644
--- a/src/device/tests/Device_Emulated.py
+++ b/src/device/tests/Device_Emulated.py
@@ -34,7 +34,10 @@ RSRC_SUBIF    = RSRC_EP    + '/subinterfaces/subinterface[{:d}]'
 RSRC_ADDRIPV4 = RSRC_SUBIF + '/ipv4/address[{:s}]'
 
 DEVICE_EMU_ENDPOINTS_COOKED = []
-for endpoint_uuid,endpoint_type,endpoint_sample_types in DEVICE_EMU_EP_DESCS:
+for endpoint_data in DEVICE_EMU_EP_DESCS:
+    endpoint_uuid = endpoint_data['uuid']
+    endpoint_type = endpoint_data['type']
+    endpoint_sample_types = endpoint_data['sample_types']
     endpoint_resource_key = RSRC_EP.format(str(endpoint_uuid))
     sample_types = {}
     for endpoint_sample_type in endpoint_sample_types: