diff --git a/lib/openbmc_ffdc.robot b/lib/openbmc_ffdc.robot
index 2c3dbb5..70b7656 100755
--- a/lib/openbmc_ffdc.robot
+++ b/lib/openbmc_ffdc.robot
@@ -47,9 +47,9 @@
     ...                      20160822041250969913:Test:Test case 2:FAIL
     ...               3. Delete error logs and BMC dumps post FFDC collection.
 
-    ${OVERRIDE_FFDC_ON_TEST_CASE_FAIL}=  Get Variable Value  ${OVERRIDE_FFDC_ON_TEST_CASE_FAIL}  0
+    ${OVERRIDE_FFDC_ON_TEST_CASE_FAIL}=  Get Environment Variable  OVERRIDE_FFDC_ON_TEST_CASE_FAIL  0
     ${OVERRIDE_FFDC_ON_TEST_CASE_FAIL}=  Convert To Integer  ${OVERRIDE_FFDC_ON_TEST_CASE_FAIL}
-    Return From Keyword If  '${OVERRIDE_FFDC_ON_TEST_CASE_FAIL}'
+    Return From Keyword If  ${OVERRIDE_FFDC_ON_TEST_CASE_FAIL}
 
     Run Keyword If  '${TEST_STATUS}' == 'FAIL'  FFDC