diff --git a/modules/integration/tests-platform/src/test/java/org/wso2/automation/platform/tests/apim/is/SingleSignOnTestCase.java b/modules/integration/tests-platform/src/test/java/org/wso2/automation/platform/tests/apim/is/SingleSignOnTestCase.java
index 5fb4460530..a3a3ea2fb8 100644
--- a/modules/integration/tests-platform/src/test/java/org/wso2/automation/platform/tests/apim/is/SingleSignOnTestCase.java
+++ b/modules/integration/tests-platform/src/test/java/org/wso2/automation/platform/tests/apim/is/SingleSignOnTestCase.java
@@ -152,8 +152,8 @@ public void init() throws APIManagerIntegrationTestException {
 
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
-        super.cleanup();
         deleteApplication();
+        super.cleanup();
     }
 
     @Test(description = "Login to publisher using username and password", groups = "wso2.apim.is")
@@ -614,14 +614,14 @@ public void createApplicationTest() throws Exception {
                 "application-add/ajax/application-add.jag", urlParameters, csrf);
         assertEquals(Response.Status.OK.getStatusCode(), response.getStatusLine().getStatusCode(),
                 "Response mismatch not 200");
-        boolean errorOccur = getResponseBody(response).contains("\"error\" : true");
-        assertFalse(errorOccur, "Error when Application Creation");
+        boolean isError = getResponseBody(response).contains("\"error\" : true");
+        assertFalse(isError, "Error when Application Creation");
         EntityUtils.consume(response.getEntity());
 
         response = sendGetRequest(httpsStoreUrl + "/site/blocks/application/"
                 + "application-list/ajax/application-list.jag?action=getApplications");
-        boolean appExist = getResponseBody(response).contains("\"name\" : \"" + testApplicationName + "\"");
-        assertTrue(appExist, "Application Creattion not succesful");
+        boolean isAppExist = getResponseBody(response).contains("\"name\" : \"" + testApplicationName + "\"");
+        assertTrue(isAppExist, "Application Creattion not succesful");
         EntityUtils.consume(response.getEntity());
     }
 
@@ -640,8 +640,8 @@ private void deleteApplication() throws Exception {
                 "application-remove/ajax/application-remove.jag", urlParameters, csrf);
         assertEquals(Response.Status.OK.getStatusCode(), response.getStatusLine().getStatusCode(),
                 "Response mismatch not 200");
-        boolean errorOccur = getResponseBody(response).contains("\"error\" : true");
-        assertTrue(!errorOccur, "Error on Application deletion");
+        boolean isError = getResponseBody(response).contains("\"error\" : true");
+        assertFalse(isError, "Error on Application deletion");
         EntityUtils.consume(response.getEntity());
 
         urlParameters.clear();
@@ -653,8 +653,8 @@ private void deleteApplication() throws Exception {
 
         response = sendGetRequest(httpsStoreUrl + "/site/blocks/application/"
                 + "application-list/ajax/application-list.jag?action=getApplications");
-        boolean appExist = getResponseBody(response).contains("\"name\" : \"" + testApplicationName + "\"");
-        assertFalse(appExist, "Application Deletion not successfull");
+        boolean isAppExist = getResponseBody(response).contains("\"name\" : \"" + testApplicationName + "\"");
+        assertFalse(isAppExist, "Application Deletion not successfull");
         EntityUtils.consume(response.getEntity());
 
     }