diff --git a/scripts/lib/ci-node-test-plan.mjs b/scripts/lib/ci-node-test-plan.mjs
index 69c23fc6846..ca064927d8a 100644
--- a/scripts/lib/ci-node-test-plan.mjs
+++ b/scripts/lib/ci-node-test-plan.mjs
@@ -262,11 +262,21 @@ const SPLIT_NODE_SHARDS = new Map([
         requiresDist: false,
       },
       {
-        shardName: "agentic-plugin-sdk",
+        shardName: "agentic-gateway-core",
         configs: [
           "test/vitest/vitest.gateway-core.config.ts",
           "test/vitest/vitest.gateway-client.config.ts",
-          "test/vitest/vitest.gateway-methods.config.ts",
+        ],
+        requiresDist: false,
+      },
+      {
+        shardName: "agentic-gateway-methods",
+        configs: ["test/vitest/vitest.gateway-methods.config.ts"],
+        requiresDist: false,
+      },
+      {
+        shardName: "agentic-plugin-sdk",
+        configs: [
           "test/vitest/vitest.plugin-sdk-light.config.ts",
           "test/vitest/vitest.plugin-sdk.config.ts",
         ],
diff --git a/test/scripts/ci-node-test-plan.test.ts b/test/scripts/ci-node-test-plan.test.ts
index 756996bda8d..990511ff8d3 100644
--- a/test/scripts/ci-node-test-plan.test.ts
+++ b/test/scripts/ci-node-test-plan.test.ts
@@ -170,7 +170,7 @@ describe("scripts/lib/ci-node-test-plan.mjs", () => {
     ]);
   });
 
-  it("splits the agentic lane into control-plane, command, agent, SDK, and plugin shards", () => {
+  it("splits the agentic lane into control-plane, command, agent, gateway, SDK, and plugin shards", () => {
     const shards = createNodeTestShards();
     const controlPlaneShard = shards.find((shard) => shard.shardName === "agentic-control-plane");
     const cliShard = shards.find((shard) => shard.shardName === "agentic-cli");
@@ -179,6 +179,10 @@ describe("scripts/lib/ci-node-test-plan.mjs", () => {
     );
     const commandShards = shards.filter((shard) => shard.shardName.startsWith("agentic-commands-"));
     const agentShard = shards.find((shard) => shard.shardName === "agentic-agents");
+    const gatewayCoreShard = shards.find((shard) => shard.shardName === "agentic-gateway-core");
+    const gatewayMethodsShard = shards.find(
+      (shard) => shard.shardName === "agentic-gateway-methods",
+    );
     const pluginSdkShard = shards.find((shard) => shard.shardName === "agentic-plugin-sdk");
     const pluginsShard = shards.find((shard) => shard.shardName === "agentic-plugins");
 
@@ -244,14 +248,26 @@ describe("scripts/lib/ci-node-test-plan.mjs", () => {
       checkName: "checks-node-agentic-plugin-sdk",
       shardName: "agentic-plugin-sdk",
       configs: [
-        "test/vitest/vitest.gateway-core.config.ts",
-        "test/vitest/vitest.gateway-client.config.ts",
-        "test/vitest/vitest.gateway-methods.config.ts",
         "test/vitest/vitest.plugin-sdk-light.config.ts",
         "test/vitest/vitest.plugin-sdk.config.ts",
       ],
       requiresDist: false,
     });
+    expect(gatewayCoreShard).toEqual({
+      checkName: "checks-node-agentic-gateway-core",
+      shardName: "agentic-gateway-core",
+      configs: [
+        "test/vitest/vitest.gateway-core.config.ts",
+        "test/vitest/vitest.gateway-client.config.ts",
+      ],
+      requiresDist: false,
+    });
+    expect(gatewayMethodsShard).toEqual({
+      checkName: "checks-node-agentic-gateway-methods",
+      shardName: "agentic-gateway-methods",
+      configs: ["test/vitest/vitest.gateway-methods.config.ts"],
+      requiresDist: false,
+    });
     expect(pluginsShard).toEqual({
       checkName: "checks-node-agentic-plugins",
       shardName: "agentic-plugins",
@@ -280,6 +296,8 @@ describe("scripts/lib/ci-node-test-plan.mjs", () => {
     const shards = createNodeTestShards({ includeReleaseOnlyPluginShards: false });
 
     expect(shards.some((shard) => shard.shardName === "agentic-plugins")).toBe(false);
+    expect(shards.some((shard) => shard.shardName === "agentic-gateway-core")).toBe(true);
+    expect(shards.some((shard) => shard.shardName === "agentic-gateway-methods")).toBe(true);
     expect(shards.some((shard) => shard.shardName === "agentic-plugin-sdk")).toBe(true);
   });