diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 7bba6352e3..9708f16f35 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -12,22 +12,16 @@ concurrency:
   cancel-in-progress: true
 jobs:
   unit:
-    name: PR check for YDB C++ SDK
-    runs-on: ubuntu-22.04
-    services:
-      ydb:
-        image: ydbplatform/local-ydb:latest
-        ports:
-          - 2135:2135
-          - 2136:2136
-          - 8765:8765
-        volumes:
-          - /tmp/ydb_certs:/ydb_certs
-        env:
-          YDB_LOCAL_SURVIVE_RESTART: true
-          YDB_USE_IN_MEMORY_PDISKS: true
-          YDB_TABLE_ENABLE_PREPARED_DDL: true
-        options: '-h localhost'
+    concurrency:
+        group: unit-${{ github.ref }}-${{ matrix.os }}-${{ matrix.go-version }}
+        cancel-in-progress: true
+      strategy:
+        fail-fast: false
+        matrix:
+          os: [ubuntu, macOS]
+      env:
+        OS: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}-latest
     steps:
     - name: Checkout PR
       uses: actions/checkout@v3
@@ -63,11 +57,17 @@ jobs:
         ctest -j32 --preset release-unit
 
   integrtion:
-    name: PR check for YDB C++ SDK
-    runs-on: ubuntu-22.04
+    concurrency:
+      group: integration-${{ github.ref }}-${{ matrix.os }}-${{ matrix.go-version }}-${{ matrix.ydb-version }}
+      cancel-in-progress: true
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ydb-version: [23.3, 24.1]
     services:
       ydb:
-        image: ydbplatform/local-ydb:latest
+        image: ydbplatform/local-ydb:${{ matrix.ydb-version }}
         ports:
           - 2135:2135
           - 2136:2136