diff --git a/Runner/suites/Kernel/FunctionalArea/baseport/rngtest/run.sh b/Runner/suites/Kernel/FunctionalArea/baseport/rngtest/run.sh
index 6a6a9c60..5b07b702 100755
--- a/Runner/suites/Kernel/FunctionalArea/baseport/rngtest/run.sh
+++ b/Runner/suites/Kernel/FunctionalArea/baseport/rngtest/run.sh
@@ -83,11 +83,13 @@ log_info "rngtest: FIPS 140-2 successes = $successes"
 if [ "$successes" -ge 10 ]; then
     log_pass "$TESTNAME : Test Passed ($successes FIPS 140-2 successes)"
     echo "$TESTNAME PASS" > "$res_file"
+    rm -f "$TMP_BIN" "$TMP_OUT"
+    exit 0
 else
     log_fail "$TESTNAME : Test Failed ($successes FIPS 140-2 successes)"
     echo "$TESTNAME FAIL" > "$res_file"
+    rm -f "$TMP_BIN" "$TMP_OUT"
+    exit 1
 fi
 
-rm -f "$TMP_BIN" "$TMP_OUT"
-
 log_info "-------------------Completed $TESTNAME Testcase----------------------------"