diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java
index d89618a739..00c17926c2 100644
--- a/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java
+++ b/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java
@@ -275,6 +275,7 @@ public static void suiteSetup() {
 		if (listOfModules.contains("idrepo")) {
 			setReportName("idrepo");
 			BaseTestCase.currentModule = "idrepo";
+			BaseTestCase.certsForModule = "idrepo";
 			AdminTestUtil.copyIdrepoTestResource();
 		}
 
@@ -287,6 +288,7 @@ public static void suiteSetup() {
 
 		if (listOfModules.contains(GlobalConstants.MIMOTO)) {
 			BaseTestCase.currentModule = GlobalConstants.MIMOTO;
+			BaseTestCase.certsForModule = GlobalConstants.MIMOTO;
 			setReportName(GlobalConstants.MIMOTO);
 			AdminTestUtil.initiateMimotoTest();
 			mockSMTPListener = new MockSMTPListener();
@@ -309,6 +311,7 @@ public static void suiteSetup() {
 		}
 		if (listOfModules.contains(GlobalConstants.RESIDENT)) {
 			BaseTestCase.currentModule = GlobalConstants.RESIDENT;
+			BaseTestCase.certsForModule = GlobalConstants.RESIDENT;
 			setReportName(GlobalConstants.RESIDENT);
 			AdminTestUtil.copyResidentTestResource();
 		    mockSMTPListener = new MockSMTPListener();