@@ -3,10 +3,10 @@ name: Compile against documentation examples
 on:
   workflow_call:
   workflow_dispatch:
-  pull_request: # temporary until it's merged
-    branches: [ KG-ci-additions ]
-  push:
-    branches: [ KG-ci-additions ]
+#  pull_request: # temporary until it's merged
+#    branches: [ KG-ci-additions ]
+#  push:
+#    branches: [ KG-ci-additions ]
 
 jobs:
   test-compilation:
@@ -15,18 +15,12 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
 
-      - name: Install maven
-        shell: bash
-        run: |
-          sudo apt update
-          sudo apt install maven -y
-
       - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:
-          distribution: adopt
-          java-version: 21
-          cache: maven
+          java-version: 17
+          distribution: 'temurin'
+          cache: 'maven'
 
       - name: Build with Maven
         shell: bash
 
@@ -0,0 +1,42 @@
+name: Run integration tests against HCD
+
+on:
+  workflow_call:
+  workflow_dispatch:
+  pull_request: # temporary until it's merged
+    branches: [ KG-ci-additions ]
+  push:
+    branches: [ KG-ci-additions ]
+
+permissions:
+  id-token: write
+
+jobs:
+  test-integration-hcd:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Setup Java 17
+        uses: actions/setup-java@v5
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Configure AWS credentials from OIDC
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::559669398656:role/astra-db-java-ecr-ro-user
+          aws-region: us-west-2
+
+      - name: Login to Amazon ECR
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Start HCD and Data API
+        run: docker-compose -f docker-compose-hcd.yml up -d --wait
+        working-directory: ${{ github.workspace }}/astra-db-java/src/test/resources
+
+      - name: Run integration tests
+        run: mvn clean verify -pl astra-db-java -Plocal
@@ -0,0 +1,35 @@
+name: Run unit tests
+
+on:
+  workflow_call:
+    inputs:
+      java_versions:
+        type: string
+        description: 'Comma-separated list of Java versions e.g. "17","21"'
+        required: true
+  workflow_dispatch:
+    inputs:
+      java_versions:
+        description: 'Comma-separated list of Java versions e.g. "17","21"'
+        default: '"17"'
+        required: false
+
+jobs:
+  unit-tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java-version: ${{ fromJSON(format('[{0}]', inputs.java_versions || '"17"')) }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Set up JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v5
+        with:
+          java-version: ${{ matrix.java-version }}
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Run unit tests
+        run: mvn clean test -Dtest='!**/*IT' -Dtest.skipped=false -pl astra-db-java -B