diff --git a/lib/ras/host_utils.robot b/lib/ras/host_utils.robot
index c5db391..a4f2cee 100755
--- a/lib/ras/host_utils.robot
+++ b/lib/ras/host_utils.robot
@@ -146,10 +146,11 @@
     ${no_of_states}=  Convert To Integer  ${output}
 
     # Disable state for all cpus.
-    :FOR  ${count}  IN RANGE  ${no_of_states}
-    \  ${cmd}=  Catenate  SEPARATOR=  for file_path in /sys/devices/system/cpu/
-     ...  cpu*/cpuidle/state${i}/disable; do echo 1 > $file_path; done
-    \  ${output}  ${stderr}  ${rc}=  Run Keyword  OS Execute Command  ${cmd}
+    FOR  ${count}  IN RANGE  ${no_of_states}
+        ${cmd}=  Catenate  SEPARATOR=  for file_path in /sys/devices/system/cpu/
+        ...  cpu*/cpuidle/state${count}/disable; do echo 1 > $file_path; done
+        ${output}  ${stderr}  ${rc}=  Run Keyword  OS Execute Command  ${cmd}
+    END
 
 Is Opal-PRD Service Enabled
     [Documentation]  Check if Opal-PRD service is running & return either
diff --git a/openpower/ras/test_bmc_ras.robot b/openpower/ras/test_bmc_ras.robot
index 8dcac9f..305743b 100755
--- a/openpower/ras/test_bmc_ras.robot
+++ b/openpower/ras/test_bmc_ras.robot
@@ -161,15 +161,6 @@
     Inject Recoverable Error With Threshold Limit
     ...  BMC  ${value[0]}  ${value[1]}  32  ${value[2]}  ${err_log_path}
 
-Verify Pdbg Unrecoverable Callout Handling For NXDMAENG
-    [Documentation]  Verify unrecoverable callout handling for NXDMAENG
-    ...              with pdbg tool.
-    [Tags]  Verify_Pdbg_Unrecoverable_Callout_Handling_For_NXDMAENG
-
-    ${value}=  Get From Dictionary  ${ERROR_INJECT_DICT}  NX_UE
-    ${err_log_path}=  Catenate  ${RAS_LOG_DIR_PATH}nxfir_ue
-    Inject Unrecoverable Error  BMC
-    ...  ${value[0]}  ${value[1]}  1  ${value[2]}  ${err_log_path}
 
 #  L2FIR related error injection.
 
diff --git a/openpower/ras/test_host_boot_ras.robot b/openpower/ras/test_host_boot_ras.robot
index 09fbd92..f120e1c 100644
--- a/openpower/ras/test_host_boot_ras.robot
+++ b/openpower/ras/test_host_boot_ras.robot
@@ -140,16 +140,6 @@
     Inject Error At HOST Boot Path  ${value[0]}  ${value[1]}
     ...  ${value[2]}  ${err_log_path}
 
-Verify Pdbg Unrecoverable Callout Handling For NXDMAENG During Host Boot
-    [Documentation]  Verify unrecoverable callout handling for NXDMAENG
-    ...              using pdbg tool during Host Boot path.
-    [Tags]  Verify_Pdbg_Unrecoverable_Callout_Handling_For_NXDMAENG_During_Host_Boot
-
-    ${value}=  Get From Dictionary  ${ERROR_INJECT_DICT}  NX_UE
-    ${err_log_path}=  Catenate  ${RAS_LOG_DIR_PATH}nxfir_ue
-    Inject Error At HOST Boot Path  ${value[0]}  ${value[1]}
-    ...  ${value[2]}  ${err_log_path}
-
 Verify Pdbg Unrecoverable Callout Handling For CXA During Host Boot
     [Documentation]  Verify unrecoverable callout handling for CXAFIR
     ...              using pdbg tool during Host Boot path.
diff --git a/openpower/ras/test_host_ras.robot b/openpower/ras/test_host_ras.robot
index c7edfd9..18acb42 100755
--- a/openpower/ras/test_host_ras.robot
+++ b/openpower/ras/test_host_ras.robot
@@ -155,15 +155,6 @@
     Inject Recoverable Error With Threshold Limit
     ...  HOST  ${value[0]}  ${value[1]}  32  ${value[2]}  ${err_log_path}
 
-Verify Unrecoverable Callout Handling For NXDMAENG
-    [Documentation]  Verify unrecoverable callout handling for NXDMAENG.
-    [Tags]  Verify_Unrecoverable_Callout_Handling_For_NXDMAENG
-
-    ${value}=  Get From Dictionary  ${ERROR_INJECT_DICT}  NX_UE
-    ${err_log_path}=  Catenate  ${RAS_LOG_DIR_PATH}nxfir_ue
-    Inject Unrecoverable Error  HOST
-    ...  ${value[0]}  ${value[1]}  1  ${value[2]}  ${err_log_path}
-
 #  L2FIR related error injection.
 
 Verify Recoverable Callout Handling For L2FIR With Threshold 1