diff --git a/.github/workflows/build-test-prValidation.yml b/.github/workflows/build-test-prValidation.yml
index 493825b106..9aeb9a9272 100644
--- a/.github/workflows/build-test-prValidation.yml
+++ b/.github/workflows/build-test-prValidation.yml
@@ -57,6 +57,9 @@ jobs:
     runs-on: ubuntu-22.04
     env:
       DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+    strategy:
+      matrix:
+        scalaVersion: ["2.13.x", "3.3.x"]
     steps:
       - name: Checkout
         uses: actions/checkout@v6.0.1
@@ -94,7 +97,7 @@ jobs:
           -Dpekko.test.multi-node=false \
           -Dsbt.log.noformat=false \
           -Dpekko.log.timestamps=true \
-          validateCompile
+          "++ ${{ matrix.scalaVersion }} validateCompile"
 
       - name: sbt validatePullRequest
         run: |-
@@ -110,7 +113,7 @@ jobs:
           -Dsbt.log.noformat=false \
           -Dpekko.log.timestamps=true \
           -Dio.netty.leakDetection.level=PARANOID \
-          validatePullRequest
+          "++ ${{ matrix.scalaVersion }} validatePullRequest"
 
   pekko-classic-remoting-tests:
     name: Pekko Classic Remoting Tests
diff --git a/.github/workflows/scala3-build.yml b/.github/workflows/scala3-build.yml
deleted file mode 100644
index a3c3676857..0000000000
--- a/.github/workflows/scala3-build.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: Build and test Pekko with Scala 3
-
-on:
-  schedule:
-    - cron: "0 0 * * *"
-  pull_request:
-  workflow_dispatch:
-
-permissions: {}
-
-concurrency:
-  # Only run once for latest commit per ref and cancel other (previous) runs.
-  group: ci-scala3-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  test:
-    name: Test
-    runs-on: ubuntu-22.04
-    if: github.repository == 'apache/pekko'
-    strategy:
-      fail-fast: true
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6.0.1
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-          persist-credentials: false
-
-      - name: Setup Java 17
-        uses: actions/setup-java@v5
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Install sbt
-        uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1.1.14
-
-      - name: Cache Coursier cache
-        uses: coursier/cache-action@bebeeb0e6f48ebad66d3783946588ecf43114433 # 6.4.8
-
-      - name: Enable jvm-opts
-        run: cp .jvmopts-ci .jvmopts
-
-      - name: Compile and run tests on Scala 3
-        env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
-        # note that this is not running any multi-jvm tests (yet) because multi-in-test=false
-        run: |
-          sbt \
-          -Dpekko.log.timestamps=true \
-          -Dpekko.test.timefactor=2 \
-          -Dpekko.actor.testkit.typed.timefactor=2 \
-          -Dpekko.test.multi-in-test=false \
-          -Dpekko.test.tags.exclude=gh-exclude,timing \
-          -Dmultinode.XX:MetaspaceSize=128M \
-          -Dmultinode.Xms256M \
-          -Dmultinode.Xmx256M \
-          -Dmultinode.XX:+AlwaysActAsServerClassMachine \
-          "++ 3.x test"