diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index e77d064d..72f52992 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -8,6 +8,10 @@ on:
     # Run every week at 20:00 on Sunday
     - cron: "0 20 * * 0"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.base_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   ament_lint:
     name: Ament lint
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 8b447635..6289887a 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -7,6 +7,11 @@ on:
   schedule:
     # Run every week at 20:00 on Sunday
     - cron: "0 20 * * 0"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.base_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   ros_distro_from_branch_name:
     name: What is the distro?
diff --git a/diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py b/diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py
index 92c23570..db02c91d 100644
--- a/diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py
+++ b/diagnostic_common_diagnostics/test/systemtest/test_cpu_monitor.py
@@ -62,6 +62,9 @@ def setUp(self):
         time.sleep(0.1)
 
     def diagnostics_callback(self, msg):
+        if msg.status[0].message == 'Node starting up':
+            # Ignore the task monitor runtime status message
+            return
         if len(msg.status) > 0:
             self.message_recieved = True
         else:
diff --git a/diagnostic_topic_monitor/test/test_topic_age_monitor.py b/diagnostic_topic_monitor/test/test_topic_age_monitor.py
index 4625e30f..9622ad5b 100755
--- a/diagnostic_topic_monitor/test/test_topic_age_monitor.py
+++ b/diagnostic_topic_monitor/test/test_topic_age_monitor.py
@@ -168,6 +168,9 @@ def stat_cb(self, msg):
         """Store message for future processing."""
         if len(msg.status) == 0:
             return
+        if msg.status[0].message == 'Node starting up':
+            # Ignore the task monitor runtime status message
+            return
         if CONFIG_MONITOR_NAME in msg.status[0].name:
             self.age_messages.append(msg)
 
diff --git a/diagnostic_topic_monitor/test/test_topic_frequency_monitor.py b/diagnostic_topic_monitor/test/test_topic_frequency_monitor.py
index d7cc7d05..6c12da8a 100755
--- a/diagnostic_topic_monitor/test/test_topic_frequency_monitor.py
+++ b/diagnostic_topic_monitor/test/test_topic_frequency_monitor.py
@@ -182,6 +182,9 @@ def stat_cb(self, msg):
         """Store message for future processing."""
         if len(msg.status) == 0:
             return
+        if msg.status[0].message == 'Node starting up':
+            # Ignore the task monitor runtime status message
+            return
         if CONFIG_MONITOR_NAME in msg.status[0].name:
             self.freq_messages.append(msg)
         else: