diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py
index 304539c4c0551d9b3242b36d345c0b35666d3a29..e70827cbc453d7ab754cddb6d7c2471a5f4c5bae 100644
--- a/src/monitoring/tests/test_unitary.py
+++ b/src/monitoring/tests/test_unitary.py
@@ -254,8 +254,8 @@ def test_monitor_kpi(
     LOGGER.info('Adding Device {:s}'.format(DEVICE_DEV1_UUID))
     device_with_connect_rules = copy.deepcopy(DEVICE_DEV1)
     device_with_connect_rules['device_config']['config_rules'].extend(DEVICE_DEV1_CONNECT_RULES)
-    response = device_client.AddDevice(Device(**device_with_connect_rules))
-    assert response.device_uuid.uuid == DEVICE_DEV1_UUID
+    device_id = device_client.AddDevice(Device(**device_with_connect_rules))
+    assert device_id.device_uuid.uuid == DEVICE_DEV1_UUID
 
     response = monitoring_client.SetKpi(create_kpi_request('1'))
     _monitor_kpi_request = monitor_kpi_request(response.kpi_id.uuid, 120, 5) # pylint: disable=maybe-no-member
@@ -263,7 +263,7 @@ def test_monitor_kpi(
     LOGGER.debug(str(response))
     assert isinstance(response, Empty)
 
-    device_client.DeleteDevice(response)
+    device_client.DeleteDevice(device_id)
 
 # Test case that makes use of client fixture to test server's QueryKpiData method
 def test_query_kpi_data(monitoring_client,subs_scheduler): # pylint: disable=redefined-outer-name