diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java b/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java
index aa0a53ff52..d3c41d6c7e 100644
--- a/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java
+++ b/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java
@@ -93,19 +93,15 @@ public static void main(String[] arg) {
 			LOGGER.error("Exception " + e.getMessage());
 		}
 
-		OTPListener.bTerminate = true;
-
 		if (BaseTestCase.isTargetEnvLTS())
 			HealthChecker.bTerminate = true;
 
-		if (BaseTestCase.listOfModules.contains("partner")) {
-			DBManager.executeDBQueries(PMSConfigManger.getPMSDbUrl(), PMSConfigManger.getPMSDbUser(),
-					PMSConfigManger.getPMSDbPass(), PMSConfigManger.getPMSDbSchema(),
-					getGlobalResourcePath() + "/" + "config/pmsDataDeleteQueries.txt");
-			DBManager.executeDBQueries(PMSConfigManger.getKMDbUrl(), PMSConfigManger.getKMDbUser(),
-					PMSConfigManger.getKMDbPass(), PMSConfigManger.getKMDbSchema(),
-					getGlobalResourcePath() + "/" + "config/keyManagerDataDeleteQueries.txt");
-		}
+		DBManager.executeDBQueries(PMSConfigManger.getPMSDbUrl(), PMSConfigManger.getPMSDbUser(),
+				PMSConfigManger.getPMSDbPass(), PMSConfigManger.getPMSDbSchema(),
+				getGlobalResourcePath() + "/" + "config/pmsDataDeleteQueries.txt");
+		DBManager.executeDBQueries(PMSConfigManger.getKMDbUrl(), PMSConfigManger.getKMDbUser(),
+				PMSConfigManger.getKMDbPass(), PMSConfigManger.getKMDbSchema(),
+				getGlobalResourcePath() + "/" + "config/keyManagerDataDeleteQueries.txt");
 
 		System.exit(0);
 
@@ -134,8 +130,6 @@ public static void suiteSetup(String runType) {
 		BaseTestCase.currentModule = "partner";
 		BaseTestCase.setReportName("partner");
 		AdminTestUtil.copyPartnerTestResource();
-		BaseTestCase.otpListener = new OTPListener();
-		BaseTestCase.otpListener.run();
 	}
 
 	private static void setLogLevels() {