diff --git a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
index da99bd2..c27bd47 100644
--- a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
+++ b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
@@ -45,7 +45,7 @@
             main.testSetUp = ONOSSetup()
         except ImportError:
             main.log.error( "ONOSSetup not found. exiting the test" )
-            main.exit()
+            main.cleanAndExit()
         main.testSetUp.envSetupDescription()
         stepResult = main.FALSE
         try:
@@ -272,8 +272,7 @@
         tLastPostEnd = time.time()
         if main.postFailed:
             main.log.error( "Flow batch posting failed, exit test" )
-            main.cleanup()
-            main.exit()
+            main.cleanAndExit()
 
         main.step( "Check to ensure all flows are in added state." )
         #pprint( main.addedBatchList )