diff --git a/tests/functional/Voltha_ErrorScenarios.robot b/tests/functional/Voltha_ErrorScenarios.robot
index 9640838..93de819 100644
--- a/tests/functional/Voltha_ErrorScenarios.robot
+++ b/tests/functional/Voltha_ErrorScenarios.robot
@@ -84,10 +84,10 @@
     Should Contain     ${output}    Device is already pre-provisioned
     Log    "This OLT is added already and enabled"
 
-Test Disable different device id which is not in the device list
-    [Documentation]    Disable a device id which is not listed in the voltctl device list
+Test Disable or Enable different device id which is not in the device list
+    [Documentation]    Disable or Enable  a device id which is not listed in the voltctl device list
     ...    command and ensure that error message is shown.
-    [Tags]    functional    DisableInvalidDevice    VOL-2412
+    [Tags]    functional    DisableEnableInvalidDevice    VOL-2412-2413
     [Setup]    Run Keywords    Announce Message    START TEST DisableInvalidDevice
     ...        AND             Start Logging    DisableInvalidDevice
     [Teardown]    Run Keywords    Collect Logs
@@ -112,6 +112,11 @@
     #Disable fake device id
     ${rc}  ${output}=    Run and Return Rc and Output    ${VOLTCTL_CONFIG}; voltctl device disable ${fakeDeviceId}
     Should Contain    ${output}     Error while disabling '${fakeDeviceId}'
+    #Disable device for VOL-2413
+    Disable Device    ${device_id}
+    #Enable fake device id
+    ${rc}  ${output}=    Run and Return Rc and Output    ${VOLTCTL_CONFIG}; voltctl device enable ${fakeDeviceId}
+    Should Contain    ${output}     Error while enabling '${fakeDeviceId}'
 
 Check deletion of OLT/ONU before disabling
     [Documentation]    Try deleting OL/ONU before disabling and check error message