diff --git a/clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java b/clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java
index 8faa60d71..45b0be5e9 100644
--- a/clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java
+++ b/clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java
@@ -233,7 +233,7 @@ public void testPingFailure() {
         }
     }
 
-    @Test // (groups = "integration")
+    @Test(groups = "integration")
     public void testTransaction() throws ClickHouseException {
         if (isCloud()) return; //TODO: testTransaction - Revisit, see: https://github.com/ClickHouse/clickhouse-java/issues/1747
         testAbortTransaction();
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/AccessManagementTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/AccessManagementTest.java
index 1786ca9e9..bba0cbb68 100644
--- a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/AccessManagementTest.java
+++ b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/AccessManagementTest.java
@@ -17,6 +17,7 @@
 import java.util.Arrays;
 import java.util.Properties;
 
+@Test(groups = { "integration" })
 public class AccessManagementTest extends JdbcIntegrationTest {
     @BeforeMethod(groups = "integration")
     public void setV1() {
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java
index 954db49c9..ec676d368 100644
--- a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java
+++ b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java
@@ -60,6 +60,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+@Test(groups = { "integration" })
 public class ClickHouseStatementTest extends JdbcIntegrationTest {
     @BeforeMethod(groups = "integration")
     public void setV1() {
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/GenericJDBCTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/GenericJDBCTest.java
index a5ae2614c..c9474c2f2 100644
--- a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/GenericJDBCTest.java
+++ b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/GenericJDBCTest.java
@@ -9,6 +9,7 @@
 
 import static org.testng.Assert.assertThrows;
 
+@Test(groups = { "integration" })
 public class GenericJDBCTest extends JdbcIntegrationTest {
     public Connection getConnection(Properties properties) throws SQLException {
         if (properties == null) {
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/JdbcIssuesTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/JdbcIssuesTest.java
index 53e063206..f86d9a9f2 100644
--- a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/JdbcIssuesTest.java
+++ b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/JdbcIssuesTest.java
@@ -12,6 +12,7 @@
 import java.sql.Statement;
 import java.util.Properties;
 
+@Test(groups = { "integration" })
 public class JdbcIssuesTest extends JdbcIntegrationTest {
     @BeforeMethod(groups = "integration")
     public void setV1() {
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImplTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImplTest.java
index 638759531..388fdfa92 100644
--- a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImplTest.java
+++ b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImplTest.java
@@ -12,9 +12,15 @@
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+@Test(groups = "integration")
 public class ClickHouseConnectionImplTest extends JdbcIntegrationTest {
+    @BeforeMethod(groups = "integration")
+    public void setV1() {
+        System.setProperty("clickhouse.jdbc.v1","true");
+    }
     @Test(groups = "integration")
     public void testManualCommit() throws SQLException {
         if (isCloud()) return; //TODO: testManualCommit - Revisit, see: https://github.com/ClickHouse/clickhouse-java/issues/1747
diff --git a/client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java b/client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java
index 91a460330..dbc41304f 100644
--- a/client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java
+++ b/client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java
@@ -54,6 +54,7 @@
 import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
 import static org.junit.Assert.fail;
 
+@Test(groups = {"integration"})
 public class HttpTransportTests extends BaseIntegrationTest {
 
     @Test(groups = {"integration"},dataProvider = "testConnectionTTLProvider")
diff --git a/client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java b/client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java
index d3f0f674e..b37bfe4a2 100644
--- a/client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java
+++ b/client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java
@@ -68,6 +68,7 @@
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
+@Test(groups = {"integration"})
 public class InsertTests extends BaseIntegrationTest {
     private Client client;
     private InsertSettings settings;
diff --git a/client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java b/client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java
index 908a75f2b..ba9b8f018 100644
--- a/client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java
+++ b/client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java
@@ -90,6 +90,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+@Test(groups = {"integration"})
 public class QueryTests extends BaseIntegrationTest {
 
     private final static Random RANDOM = new Random();
@@ -314,7 +315,8 @@ public void testQueryAll() throws Exception {
     public void testQueryAllSimple() throws Exception {
         testQueryAllSimple(10);
     }
-    public void testQueryAllSimple(int numberOfRecords) throws Exception {
+
+    void testQueryAllSimple(int numberOfRecords) throws Exception {
         GenericRecord record = client.queryAll("SELECT number FROM system.numbers LIMIT " + numberOfRecords).stream().findFirst().get();
         Assert.assertNotNull(record);
     }
@@ -1304,7 +1306,7 @@ private static String sq(String str) {
         return "\'" + str + "\'";
     }
 
-    public void testDataTypes(List<String> columns, List<Supplier<String>> valueGenerators, List<Consumer<ClickHouseBinaryFormatReader>> verifiers) {
+    void testDataTypes(List<String> columns, List<Supplier<String>> valueGenerators, List<Consumer<ClickHouseBinaryFormatReader>> verifiers) {
         final String table = "data_types_test_table";
 
         try {
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java
index 565e6f8a0..f82211563 100644
--- a/jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java
+++ b/jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java
@@ -39,6 +39,7 @@
 import static org.testng.Assert.assertThrows;
 import static org.testng.Assert.assertTrue;
 
+@Test(groups = { "integration" })
 public class PreparedStatementTest extends JdbcIntegrationTest {
 
     @Test(groups = { "integration" })
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java
index 058df6eb4..b9f7433cd 100644
--- a/jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java
+++ b/jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java
@@ -31,6 +31,7 @@
 import static org.testng.Assert.assertTrue;
 
 
+@Test(groups = { "integration" })
 public class StatementTest extends JdbcIntegrationTest {
     private static final Logger log = LoggerFactory.getLogger(StatementTest.class);
 
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataTest.java
index 2901b1b17..8c6e8e116 100644
--- a/jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataTest.java
+++ b/jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataTest.java
@@ -23,6 +23,7 @@
 import static org.testng.Assert.*;
 
 
+@Test(groups = { "integration" })
 public class DatabaseMetaDataTest extends JdbcIntegrationTest {
     @Test(groups = { "integration" })
     public void testGetColumns() throws Exception {
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/ResultSetMetaDataImplTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/ResultSetMetaDataImplTest.java
index b3a82717e..d7387e8af 100644
--- a/jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/ResultSetMetaDataImplTest.java
+++ b/jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/ResultSetMetaDataImplTest.java
@@ -16,7 +16,7 @@
 import static org.testng.Assert.assertThrows;
 import static org.testng.Assert.assertTrue;
 
-
+@Test(groups = { "integration" })
 public class ResultSetMetaDataImplTest extends JdbcIntegrationTest {
     @Test(groups = { "integration" })
     public void testGetColumnCount() throws Exception {
@@ -171,14 +171,14 @@ public void testGetColumnScale() throws Exception {
         }
     }
 
-    public static void assertColumnNames(ResultSet rs, String... names) throws Exception {
+    static void assertColumnNames(ResultSet rs, String... names) throws Exception {
         ResultSetMetaData metadata = rs.getMetaData();
         assertEquals(names.length, metadata.getColumnCount());
         for (int i = 0; i < metadata.getColumnCount(); i++) {
             assertEquals(names[i], metadata.getColumnName(i + 1));
         }
     }
-    public static void assertColumnTypes(ResultSet rs, String... types) throws Exception {
+    static void assertColumnTypes(ResultSet rs, String... types) throws Exception {
         ResultSetMetaData metadata = rs.getMetaData();
         assertEquals(types.length, metadata.getColumnCount());
         for (int i = 0; i < metadata.getColumnCount(); i++) {
diff --git a/pom.xml b/pom.xml
index 855ef5a12..775feeae4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -525,8 +525,8 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${surefire-plugin.version}</version>
                     <configuration>
-                        <excludedGroups>${excludedGroups}</excludedGroups>
-                        <groups>unit</groups>
+                        <!-- run unit and ungroup tests, except integration group -->
+                        <excludedGroups>integration</excludedGroups>
                         <skipTests>${skipUTs}</skipTests>
                         <useModulePath>false</useModulePath>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>