diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml
index aeb45b74f6b..53f407621de 100644
--- a/.github/workflows/test-action.yml
+++ b/.github/workflows/test-action.yml
@@ -791,8 +791,7 @@ jobs:
       - test-windows
     strategy:
       fail-fast: false
-      matrix:
-        include: ${{ fromJSON(inputs.matrix)['linux'] }}
+      matrix: ${{ fromJSON(inputs.matrix)['linux'] }}
     env:
       PIP_INDEX_URL: https://pypi.org/simple
 
diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml
index ef0a5fe30e5..7ec42aea108 100644
--- a/.github/workflows/test-packages-action.yml
+++ b/.github/workflows/test-packages-action.yml
@@ -450,8 +450,7 @@ jobs:
       - test-macos
       - test-windows
     strategy:
-      matrix:
-        include: ${{ fromJSON(inputs.matrix)['linux'] }}
+      matrix: ${{ fromJSON(inputs.matrix)['linux'] }}
 
     steps:
       - name: Checkout Source Code
diff --git a/tools/ci.py b/tools/ci.py
index aaf84e4e3f3..da2e61a213c 100644
--- a/tools/ci.py
+++ b/tools/ci.py
@@ -1707,8 +1707,15 @@ def workflow_config(
     ctx.info(f"{pprint.pformat(test_matrix)}")
     ctx.info(f"{'==== end test matrix ====':^80s}")
 
-    config["pkg-test-matrix"] = pkg_test_matrix  # type: ignore
-    config["test-matrix"] = test_matrix  # type: ignore
+    config["pkg-test-matrix"] = {}
+    config["test-matrix"] = {}
+    for platform in platforms:
+        config["pkg-test-matrix"][platform] = {}  # type: ignore
+        if pkg_test_matrix.get(platform, {}):
+            config["pkg-test-matrix"][platform]["include"] = pkg_test_matrix[platform]  # type: ignore
+        config["test-matrix"][platform] = {}  # type: ignore
+        if test_matrix.get(platform, {}):
+            config["test-matrix"][platform]["include"] = test_matrix[platform]  # type: ignore
 
     ctx.info("Jobs selected are")
     for x, y in jobs.items():