diff --git a/MEC033/MEX/IOTS/IOTDEV/RegisteredDevices.robot b/MEC033/MEX/IOTS/IOTDEV/RegisteredDevices.robot
index d4e99a1c308008d599cfdc8881ce40e9015044a0..675c44573eb8ce8378c7e337f7a584ce465c7c9c 100644
--- a/MEC033/MEX/IOTS/IOTDEV/RegisteredDevices.robot
+++ b/MEC033/MEX/IOTS/IOTDEV/RegisteredDevices.robot
@@ -81,7 +81,7 @@ TC_MEC_MEC033_IOTS_IOTDEV_002_OK
     ...  Check that the IUT registers the information of an IoT device when requested by a Service Consumer
     ...  ETSI GS MEC 033 V3.1.1, clause 7.3.3.4
     ...  https://www.etsi.org/deliver/etsi_gs/MEC/001_099/033/03.01.01_60/gs_MEC033v030101p.pdf
-    [Setup]   Test Setup   ${None}    DeviceInfo       ${REGISTER_ACTION}
+    [Setup]   Test Setup   ${DEVICE_ID}   ${None}       ${REMOVE_ACTION}
       
     Register IOT Device information     DeviceInfo
     Check HTTP Response Status Code Is    201
@@ -201,8 +201,6 @@ TC_MEC_MEC033_IOTS_IOTDEV_005_NF
 
       
 *** Keywords ***
-
-
 Test Setup 
     [Arguments]     ${deviceId}    ${content}   ${action}
     Set Headers    {"Accept":"application/json"}
diff --git a/MEC033/MEX/IOTS/IOTDEV/environment/variables.txt b/MEC033/MEX/IOTS/IOTDEV/environment/variables.txt
index 2c04369f13c19538fe5196091f6ff3923a7ba84f..ad96cdf8f02061534454c5624ebdbb2440eeacb4 100644
--- a/MEC033/MEX/IOTS/IOTDEV/environment/variables.txt
+++ b/MEC033/MEX/IOTS/IOTDEV/environment/variables.txt
@@ -15,7 +15,7 @@ ${NO_ACTION}              NO_ACTION
 
 ${FILTER_ON_ENABLE}     (eq,enabled,false) 
 ${DEVICE_ID_FIELDS}     fields=deviceId
-
+${DEVICE_ID} 			deviceId
 ${FIELDS_AND_FILTER}        fields=deviceId&filter=(eq,enabled,false)
 ${DEVICE_ID_PLACEHOLDER}    PLACEHOLDER_DEVICEID
 ${NOT_EXISTING_DEVICE_ID}   notExistingDeviceId
\ No newline at end of file