diff --git a/integration/dataservice-hosting-tests/tests-integration/tests/src/test/java/org/wso2/ei/dataservice/integration/test/odata/ODataETagTestCase.java b/integration/dataservice-hosting-tests/tests-integration/tests/src/test/java/org/wso2/ei/dataservice/integration/test/odata/ODataETagTestCase.java
index 95470b16e6..b78a47a914 100644
--- a/integration/dataservice-hosting-tests/tests-integration/tests/src/test/java/org/wso2/ei/dataservice/integration/test/odata/ODataETagTestCase.java
+++ b/integration/dataservice-hosting-tests/tests-integration/tests/src/test/java/org/wso2/ei/dataservice/integration/test/odata/ODataETagTestCase.java
@@ -225,7 +225,12 @@ public void validateETagConcurrentHandlingTestCaseForPatchMethod() throws Except
 
     @Test(groups = "wso2.dss", description = "etag concurrent handling with delete method test", dependsOnMethods = "validateETagConcurrentHandlingTestCaseForPatchMethod")
     public void validateETagConcurrentHandlingTestCaseForDeleteMethod() throws Exception {
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        System.out.println(
+                Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))
+                        ? "This test is temporarily skipped for this workflow"
+                        : ""
+        );
+        if (Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             System.out.println("This test is temporarily skipped for this workflow");
             String endpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES";
             String content = "{\"FILENAME\": \"WSO2PROD\" ,\"TYPE\" : \"dss\"}";
@@ -278,7 +283,12 @@ public void validateETagConcurrentHandlingTestCaseForDeleteMethod() throws Excep
     @Test(groups = "wso2.dss", description = "property modification using etag concurrent handling with put method test", dependsOnMethods = "validateETagConcurrentHandlingTestCaseForDeleteMethod")
     public void validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPutMethod() throws Exception {
         // To insert values
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        System.out.println(
+                Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))
+                        ? "This test is temporarily skipped for this workflow"
+                        : ""
+        );
+        if (Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             System.out.println("This test is temporarily skipped for this workflow");
             String endpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES";
             String content = "{\"FILENAME\": \"WSO2PROD\" ,\"TYPE\" : \"dss\"}";
@@ -333,7 +343,12 @@ public void validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPutMethod
 
     @Test(groups = "wso2.dss", description = "property modification using etag concurrent handling with patch method test", dependsOnMethods = "validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPutMethod")
     public void validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPatchMethod() throws Exception {
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        System.out.println(
+                Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))
+                        ? "This test is temporarily skipped for this workflow"
+                        : ""
+        );
+        if (Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             System.out.println("This test is temporarily skipped for this workflow");
             String entityEndpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES(\'WSO2PROD\')";
             String endpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES(\'WSO2PROD\')/TYPE";
diff --git a/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/aggregate/AggregateWithHighMaxAndLowMinTestCase.java b/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/aggregate/AggregateWithHighMaxAndLowMinTestCase.java
index e3231c5029..e972b3a8c2 100644
--- a/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/aggregate/AggregateWithHighMaxAndLowMinTestCase.java
+++ b/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/aggregate/AggregateWithHighMaxAndLowMinTestCase.java
@@ -158,7 +158,12 @@ public void testMoreNumberThanMaximum() throws IOException, XMLStreamException {
 
     @Test(groups = { "wso2.esb" }, description = "less number of messages than maximum count")
     public void testLessNumberThanMaximum() throws IOException, XMLStreamException {
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        System.out.println(
+                Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))
+                        ? "This test is temporarily skipped for this workflow"
+                        : ""
+        );
+        if (Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             int responseCount = 0;
 
             no_of_requests = 60;
diff --git a/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/foreach/ForEachJSONPayloadTestCase.java b/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/foreach/ForEachJSONPayloadTestCase.java
index abb4bcf555..85eb6935fe 100644
--- a/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/foreach/ForEachJSONPayloadTestCase.java
+++ b/integration/mediation-tests/tests-mediator-1/src/test/java/org/wso2/carbon/esb/mediator/test/foreach/ForEachJSONPayloadTestCase.java
@@ -50,7 +50,12 @@ public void uploadSynapseConfig() throws Exception {
 
     @Test(groups = {"wso2.esb"}, description = "Test ForEach mediator with JSON payload")
     public void testForEachMediatorWithJSONPayload() throws Exception {
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        System.out.println(
+                Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))
+                        ? "This test is temporarily skipped for this workflow"
+                        : ""
+        );
+        if (Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             String request = "{\"getQuote\":{\"request\":[{\"symbol\":\"IBM\"},{\"symbol\":\"WSO2\"},{\"symbol\":\"MSFT\"}]}}";
 
             simpleHttpClient = new SimpleHttpClient();
diff --git a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA1832MessageInjectorTestCase.java b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA1832MessageInjectorTestCase.java
index cb6f9cb15e..66c87467b1 100644
--- a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA1832MessageInjectorTestCase.java
+++ b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA1832MessageInjectorTestCase.java
@@ -53,7 +53,12 @@ protected void init() throws Exception {
 
     @Test(groups = { "wso2.esb" }, description = "Test proxy service with jms transport")
     public void testMessageInjection() throws Exception {
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        System.out.println(
+                Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))
+                        ? "This test is temporarily skipped for this workflow"
+                        : ""
+        );
+        if (Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             String queueName = "jmsQueue";
             int numberOfMsgToExpect = 10;
             TimeUnit.SECONDS.sleep(15);
diff --git a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java
index acae56f2f3..59388d33bb 100644
--- a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java
+++ b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java
@@ -23,7 +23,12 @@ protected void init() throws Exception {
 
     @Test(groups = "wso2.esb", description = "Test adding OMElements as properties when saving messages to the MessageStore")
     public void testAddingOMElementPropertyToMessageStore() throws Exception {
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        System.out.println(
+                Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))
+                        ? "This test is temporarily skipped for this workflow"
+                        : ""
+        );
+        if (Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             AxisServiceClient client = new AxisServiceClient();
             client.sendRobust(Utils.getStockQuoteRequest("IBM"), getProxyServiceURLHttp("testPS"), "getQuote");
             Assert.assertTrue(carbonLogReader.checkForLog(GET_QUOTE_REQUEST_BODY, DEFAULT_TIMEOUT), "OMElement is not saved to the message store");
diff --git a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java
index ce924ec272..af15cdaee7 100644
--- a/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java
+++ b/integration/mediation-tests/tests-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java
@@ -69,7 +69,12 @@ protected void init() throws Exception {
 
     @Test(groups = { "wso2.esb" }, description = "Test Cron Forwarding of message processor")
     public void testMessageProcessorCronForwader() throws Exception {
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        System.out.println(
+                Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))
+                        ? "This test is temporarily skipped for this workflow"
+                        : ""
+        );
+        if (Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             // SEND THE REQUEST
             String addUrl = getProxyServiceURLHttp("MSMPRetrytest");
             String payload = "{\"name\":\"Jack\"}";