diff --git a/.github/workflows/mcstas-basictest.yml b/.github/workflows/mcstas-basictest.yml
index 27c821814..3ddf1beeb 100644
--- a/.github/workflows/mcstas-basictest.yml
+++ b/.github/workflows/mcstas-basictest.yml
@@ -429,13 +429,14 @@ jobs:
              export DIFFBASE=$(git merge-base origin/main HEAD)
            fi
            echo "Diffing against: $DIFFBASE"
-
+           export RUNALL="NO"
            export CHANGEDCOMPS=$(git diff --name-only $DIFFBASE HEAD | grep '\.comp$' | grep mcstas-comps | xargs -n1 basename | sed 's/\.comp//g' | sort | uniq | xargs echo)
            export NUMCHANGEDCOMPS=$(git diff --name-only $DIFFBASE HEAD | grep '\.comp$' | grep mcstas-comps | wc -l | xargs echo)
            cd -
            compindex=0
            if [ "$NUMCHANGEDCOMPS" != "0" ];
            then
+             if [ "$NUMCHANGEDCOMPS" -lt "5" ]; then
                for comp in $CHANGEDCOMPS;
                do
                  echo Finding tests including component $comp
@@ -448,10 +449,12 @@ jobs:
                    echo No matching tests found
                  fi
                done
+             else
+               export RUNALL="YES"
+             fi
            fi
 
            cd src
-           export RUNALL="NO"
            export CHANGEDINSTR=$(git diff --name-only $DIFFBASE HEAD | grep '\.instr$' | grep mcstas-comps | xargs -n1 basename | sed 's/\.instr//g' | sort | uniq | xargs echo | sed 's/ /,/g')
            export NUMCHANGEDINSTR=$(git diff --name-only $DIFFBASE HEAD | grep '\.instr$' | grep mcstas-comps | wc -l | xargs echo)
            echo ----
diff --git a/.github/workflows/mcxtrace-basictest.yml b/.github/workflows/mcxtrace-basictest.yml
index 4f9cb5a0b..36ded9b84 100644
--- a/.github/workflows/mcxtrace-basictest.yml
+++ b/.github/workflows/mcxtrace-basictest.yml
@@ -436,13 +436,14 @@ jobs:
              export DIFFBASE=$(git merge-base origin/main HEAD)
            fi
            echo "Diffing against: $DIFFBASE"
-
-           export CHANGEDCOMPS=$(git diff --name-only $DIFFBASE HEAD | grep '\.comp$' | grep mcxtrace-comps | xargs -n1 basename | sed 's/\.comp//g' | sort | uniq | xargs echo)
-           export NUMCHANGEDCOMPS=$(git diff --name-only $DIFFBASE HEAD | grep '\.comp$' | grep mcxtrace-comps | wc -l | xargs echo)
+           export RUNALL="NO"
+           export CHANGEDCOMPS=$(git diff --name-only $DIFFBASE HEAD | grep '\.comp$' | grep mcstas-comps | xargs -n1 basename | sed 's/\.comp//g' | sort | uniq | xargs echo)
+           export NUMCHANGEDCOMPS=$(git diff --name-only $DIFFBASE HEAD | grep '\.comp$' | grep mcstas-comps | wc -l | xargs echo)
            cd -
            compindex=0
            if [ "$NUMCHANGEDCOMPS" != "0" ];
            then
+             if [ "$NUMCHANGEDCOMPS" -lt "5" ]; then
                for comp in $CHANGEDCOMPS;
                do
                  echo Finding tests including component $comp
@@ -455,10 +456,12 @@ jobs:
                    echo No matching tests found
                  fi
                done
+             else
+               export RUNALL="YES"
+             fi
            fi
 
            cd src
-           export RUNALL="NO"
            export CHANGEDINSTR=$(git diff --name-only $DIFFBASE HEAD | grep '\.instr$' | grep mcxtrace-comps | xargs -n1 basename | sed 's/\.instr//g' | sort | uniq | xargs echo | sed 's/ /,/g')
            export NUMCHANGEDINSTR=$(git diff --name-only $DIFFBASE HEAD | grep '\.instr$' | grep mcxtrace-comps | wc -l | xargs echo)
            echo ----