diff --git a/.buildkite/jdk_matrix_pipeline.yml b/.buildkite/jdk_matrix_pipeline.yml
deleted file mode 100644
index 307057543..000000000
--- a/.buildkite/jdk_matrix_pipeline.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-steps:
-  - label: "Test JDK matrix pipeline"
-    command: "echo 'Hello world'"
diff --git a/.buildkite/linux_jdk_matrix_pipeline.yml b/.buildkite/linux_jdk_matrix_pipeline.yml
new file mode 100644
index 000000000..d7ada8ec8
--- /dev/null
+++ b/.buildkite/linux_jdk_matrix_pipeline.yml
@@ -0,0 +1,3 @@
+steps:
+  - label: "Test Linux JDK matrix pipeline"
+    command: "echo 'Hello world'"
diff --git a/.buildkite/windows_jdk_matrix_pipeline.yml b/.buildkite/windows_jdk_matrix_pipeline.yml
new file mode 100644
index 000000000..e7fadf312
--- /dev/null
+++ b/.buildkite/windows_jdk_matrix_pipeline.yml
@@ -0,0 +1,3 @@
+steps:
+  - label: "Test Windows JDK matrix pipeline"
+    command: "echo 'Hello world'"