@@ -56,7 +56,7 @@ function parseJckConsole(text) {
         /Triggering\s+(\S+\.jck)\s+on\s+(\S+)\s+with\s+JDK\s+(\S+)/i;
     const remoteUrlRe = /Remote build URL:\s*(https?:\/\/\S+)/i;
     const statusRe =
-        /Remote job\s+(.+?)\s+Status:\s*(SUCCESS|UNSTABLE|FAILURE|ABORTED)/i;
+        /Remote job\s+(.+?)(?:\s+Target:\s*(\S+))?\s+Status:\s*(SUCCESS|UNSTABLE|FAILURE|ABORTED)/i;
 
     const triggers = []; // { target, platform, jdkVersion }
     const remoteUrls = []; // collected in order
@@ -88,7 +88,8 @@ function parseJckConsole(text) {
         if (statusMatch) {
             statusEntries.push({
                 displayName: statusMatch[1].trim(),
-                buildResult: statusMatch[2],
+                target: statusMatch[2]?.replace(/\.jck$/i, ''),
+                buildResult: statusMatch[3],
             });
         }
     }
@@ -108,13 +109,15 @@ function parseJckConsole(text) {
         );
     };
     statusEntries.forEach((statusEntry) => {
-        const targetMatches = triggers.filter((trigger) => {
-            const escapedTarget = escapeRegExp(trigger.target);
-            return new RegExp(
-                `(?:^|[^\\w])${escapedTarget}(?:\\.jck)?(?:$|[^\\w])`,
-                'i'
-            ).test(statusEntry.displayName);
-        });
+        const targetMatches = triggers.filter((trigger) =>
+            statusEntry.target
+                ? trigger.target.toLowerCase() ===
+                  statusEntry.target.toLowerCase()
+                : new RegExp(
+                      `(?:^|[^\\w])${escapeRegExp(trigger.target)}(?:\\.jck)?(?:$|[^\\w])`,
+                      'i'
+                  ).test(statusEntry.displayName)
+        );
         const exactMatches =
             targetMatches.length > 1
                 ? targetMatches.filter(
 
@@ -18,12 +18,45 @@ const getRemoteJckBuildInfo = require('../routes/getRemoteJckBuildInfo');
 
 test('matches remote JCK results to targets when jobs finish out of order', async () => {
     consoleOutput = [
-        'Triggering dev.jck on x86-64_linux with JDK 21',
-        'Triggering special.jck on x86-64_linux with JDK 21',
+        'Triggering dev.jck on x86-64_mac with JDK 17',
+        'Triggering special.jck on x86-64_mac with JDK 17',
         'Remote build URL: https://example.com/job/dev/1/',
         'Remote build URL: https://example.com/job/special/1/',
-        'Remote job release : jdk21 : x86-64_linux : special.jck Status: SUCCESS',
-        'Remote job release : jdk21 : x86-64_linux : dev.jck Status: FAILURE',
+        'Remote job jdk17 : jdk-17.0.21+8_adopt : weekly : x86-64_mac Target: special.jck Status: SUCCESS',
+        'Remote job jdk17 : jdk-17.0.21+8_adopt : weekly : x86-64_mac Target: dev.jck Status: FAILURE',
+    ].join('\n');
+
+    let results;
+    await getRemoteJckBuildInfo(
+        {
+            query: {
+                url: 'https://example.com',
+                buildName: 'AQA_Test_Pipeline_JCK',
+                buildNum: '1',
+            },
+        },
+        {
+            send: (response) => {
+                results = response;
+            },
+        }
+    );
+
+    assert.deepEqual(
+        results.map(({ target, buildResult }) => ({ target, buildResult })),
+        [
+            { target: 'dev', buildResult: 'FAILURE' },
+            { target: 'special', buildResult: 'SUCCESS' },
+        ]
+    );
+});
+
+test('falls back to trigger order for status lines without an explicit target', async () => {
+    consoleOutput = [
+        'Triggering dev.jck on x86-64_linux with JDK 21',
+        'Triggering special.jck on x86-64_linux with JDK 21',
+        'Remote job jdk21 : x86-64_linux Status: FAILURE',
+        'Remote job jdk21 : x86-64_linux Status: SUCCESS',
     ].join('\n');
 
     let results;