diff --git a/src/integrationTest/java/integration/tests/StatementTest.java b/src/integrationTest/java/integration/tests/StatementTest.java
index 226eb785a..456d09c3f 100644
--- a/src/integrationTest/java/integration/tests/StatementTest.java
+++ b/src/integrationTest/java/integration/tests/StatementTest.java
@@ -31,15 +31,15 @@
 @CustomLog
 class StatementTest extends IntegrationTest {
 
-//	@BeforeEach
-//	void beforeEach() {
-//		executeStatementFromFile("/statements/statement/ddl.sql");
-//	}
-//
-//	@AfterEach
-//	void afterEach() {
-//		executeStatementFromFile("/statements/statement/cleanup.sql");
-//	}
+	@BeforeEach
+	void beforeEach() {
+		executeStatementFromFile("/statements/statement/ddl.sql");
+	}
+
+	@AfterEach
+	void afterEach() {
+		executeStatementFromFile("/statements/statement/cleanup.sql");
+	}
 
 	@Test
 	void shouldSelect1() throws SQLException {
diff --git a/src/integrationTest/java/integration/tests/SystemEngineTest.java b/src/integrationTest/java/integration/tests/SystemEngineTest.java
index 0b399a6f5..0395cee80 100644
--- a/src/integrationTest/java/integration/tests/SystemEngineTest.java
+++ b/src/integrationTest/java/integration/tests/SystemEngineTest.java
@@ -33,7 +33,7 @@ public class SystemEngineTest extends IntegrationTest {
 	@BeforeAll
 	void beforeAll() {
 		try {
-			executeStatementFromFile("/statements/system/ddl.sql", null);
+			executeStatementFromFile("/statements/system/ddl.sql", getSystemEngineName());
 		} catch (Exception e) {
 			log.warn("Could not execute statement", e);
 		}
@@ -42,7 +42,7 @@ void beforeAll() {
 	@AfterAll
 	void afterAll() {
 		try {
-			executeStatementFromFile("/statements/system/cleanup.sql", null);
+			executeStatementFromFile("/statements/system/cleanup.sql", getSystemEngineName());
 		} catch (Exception e) {
 			log.warn("Could not execute statement", e);
 		}
diff --git a/src/main/java/com/firebolt/jdbc/connection/FireboltConnectionUserPasswordAuthentication.java b/src/main/java/com/firebolt/jdbc/connection/FireboltConnectionUserPasswordAuthentication.java
index 48a9ecf85..0dfb39bc6 100644
--- a/src/main/java/com/firebolt/jdbc/connection/FireboltConnectionUserPasswordAuthentication.java
+++ b/src/main/java/com/firebolt/jdbc/connection/FireboltConnectionUserPasswordAuthentication.java
@@ -57,7 +57,8 @@ protected void authenticate() throws SQLException {
     protected FireboltProperties extractFireboltProperties(String jdbcUri, Properties connectionProperties) {
         FireboltProperties properties = super.extractFireboltProperties(jdbcUri, connectionProperties);
         boolean systemEngine = "system".equals(properties.getEngine());
-        return properties.toBuilder().systemEngine(systemEngine).build();
+        boolean compressed = !systemEngine && properties.isCompress();
+        return properties.toBuilder().systemEngine(systemEngine).compress(compressed).build();
     }
 
     @Override