diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 6af35af8507..264eaa75073 100755
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -358,6 +358,9 @@
 
                                 <replace file="target/wso2carbon-core-${carbon.kernel.version}/bin/wso2server.bat" token="-Dhttpclient.hostnameVerifier=&quot;DefaultAndLocalhost&quot;" value="-Dhttpclient.hostnameVerifier=&quot;DefaultAndLocalhost&quot;" />
 
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/bin/wso2server.sh" token="-Dhttpclient.hostnameVerifier=&quot;DefaultAndLocalhost&quot; \" value="-Dhttpclient.hostnameVerifier=&quot;DefaultAndLocalhost&quot; \${line.separator}    -Doptimize=true \" />
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/bin/wso2server.bat" token="-Dhttpclient.hostnameVerifier=&quot;DefaultAndLocalhost&quot;" value="-Dhttpclient.hostnameVerifier=&quot;DefaultAndLocalhost&quot; -Doptimize=true" />
+
                                 <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/authenticators.xml" token="&lt;!--Authenticator name=&quot;MutualSSLAuthenticator&quot; disabled=&quot;false&quot;&gt;" value="&lt;Authenticator name=&quot;MutualSSLAuthenticator&quot;&gt;" />
 
                                 <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/authenticators.xml" token="&lt;/Authenticator--&gt;" value="&lt;/Authenticator&gt;" />
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/application/mgt/AbstractIdentityFederationTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/application/mgt/AbstractIdentityFederationTestCase.java
index f8d4a39698c..2abf4e787b1 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/application/mgt/AbstractIdentityFederationTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/application/mgt/AbstractIdentityFederationTestCase.java
@@ -101,6 +101,7 @@ public void initTest() throws Exception {
     public void startCarbonServer(int portOffset, AutomationContext context, Map<String, String> startupParameters)
             throws Exception {
 
+        startupParameters.put("-Doptimize", String.valueOf(false));
         automationContextMap.put(portOffset, context);
         CarbonTestServerManager server = new CarbonTestServerManager(context, System.getProperty("carbon.zip"),
                 startupParameters);
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/provisioning/ProvisioningTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/provisioning/ProvisioningTestCase.java
index 0b98769dafc..40637f88605 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/provisioning/ProvisioningTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/provisioning/ProvisioningTestCase.java
@@ -417,6 +417,7 @@ private void startOtherCarbonServers() throws Exception {
         automationContextMap.put(PORT_OFFSET_1, context1);
 
         Map<String, String> startupParameterMap2 = new HashMap<String, String>();
+        startupParameterMap2.put("-Doptimize", String.valueOf(false));
         startupParameterMap2.put(PORT_OFFSET_PARAM, String.valueOf(CommonConstants.IS_DEFAULT_OFFSET + PORT_OFFSET_2));
         startupParameterMap2.put(ENABLE_REMOTE_SHUTDOWN_RESTART_PARAM, String.valueOf(true));
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/automation.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/automation.xml
index d34fdeb51ec..c2412325eb3 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/automation.xml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/automation.xml
@@ -240,6 +240,7 @@
                     <parameter name="-DportOffset" value="410" />
                     <parameter name="-Dsetup" value="true"/>
                     <parameter name="-DenableRemoteShutdownAndRestart" value="true"/>
+                    <parameter name="-Doptimize" value="false"/>
                     <!--<parameter name="backup-test-pack" value="true"/>-->
                     <!--<parameter name="backup-location" value="<Absolute path for backup location with trailing foreword slash>"/>-->
                     <!--<parameter name="cmdArg" value="debug 5005" />-->