diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f4e6f09f1cb3..76288f6d5768 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        Dtest: [ "A*,B*", "C*", "D*,E*,F*", "G*,H*", "I*,J*", "K*,L*", "M*,N*", "O*,P*", "Q*", "R*", "S*", "T*,U*", "V*,W*,X*,Y*,Z*" ]
+        Dtest: [ "A*,F*,S*", "B*,D*,L*,T*", "C*,O*", "E*,N*,Q*", "G*,R*,U*", "H*,I*,J*", "K*,P*,V*,W*,X*,Y*,Z*", "M*"]
     uses: ./.github/workflows/worker.yml
     with:
       script: .github/scripts/run-unit-tests.sh -Dtest='${{ matrix.Dtest }}' -Dmaven.test.failure.ignore=true
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectJoinQueryMSQTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQCalciteSelectJoinQueryTest.java
similarity index 98%
rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectJoinQueryMSQTest.java
rename to extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQCalciteSelectJoinQueryTest.java
index 42ee5bac3528..0632b646cc18 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectJoinQueryMSQTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQCalciteSelectJoinQueryTest.java
@@ -32,7 +32,7 @@
 /**
  * Runs {@link CalciteJoinQueryTest} but with MSQ engine.
  */
-public class CalciteSelectJoinQueryMSQTest
+public class MSQCalciteSelectJoinQueryTest
 {
   /**
    * Run all tests with {@link JoinAlgorithm#BROADCAST}.