diff --git a/scripts/ci/test_plan.py b/scripts/ci/test_plan.py
index 14fe54fdd35..9e6c5b66dec 100755
--- a/scripts/ci/test_plan.py
+++ b/scripts/ci/test_plan.py
@@ -123,7 +123,9 @@ class Filters:
         self.find_tags()
         self.find_tests()
         if not self.platforms:
-            self.find_archs()
+            # disable for now, this is generating lots of churn when changing
+            # architectures that is otherwise covered elsewhere.
+            #self.find_archs()
             self.find_boards()
         else:
             for file in self.modified_files: