diff --git a/scripts/ci.sh b/scripts/ci.sh
index f65e7cf0a7..856529f5ec 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -9,15 +9,31 @@ case $CIRCLE_NODE_INDEX in
   ./packages/test-in-console/run.sh
   ;;
 1)
-  echo "Running self-test (1): A-C"
-  ./meteor self-test --file "^[a-c]" --exclude "$SELF_TEST_EXCLUDE"
+  echo "Running self-test (1): A-Com"
+  ./meteor self-test --file "^[a-b]|^c[a-n]|^co[a-l]|^compiler-plugins" --exclude "$SELF_TEST_EXCLUDE"
   ;;
 2)
-  echo "Running self-test (2): D-P"
-  ./meteor self-test --file "^[d-p]" --exclude "$SELF_TEST_EXCLUDE"
+  echo "Running self-test (2): Con-K"
+  ./meteor self-test --file "^co[n-z]|^c[p-z]|^[d-k]" --exclude "$SELF_TEST_EXCLUDE"
   ;;
 3)
-  echo "Running self-test (3): R-Z"
-  ./meteor self-test --file "^[r-z]" --exclude "$SELF_TEST_EXCLUDE"
+  echo "Running self-test (3): L-O"
+  ./meteor self-test --file "^[l-o]" --exclude "$SELF_TEST_EXCLUDE"
+  ;;
+4)
+  echo "Running self-test (4): P"
+  ./meteor self-test --file "^p" --exclude "$SELF_TEST_EXCLUDE"
+  ;;
+5)
+  echo "Running self-test (5): Run"
+  ./meteor self-test --file "^run" --exclude "$SELF_TEST_EXCLUDE"
+  ;;
+6)
+  echo "Running self-test (6): R-So"
+  ./meteor self-test --file "^r(?!un)|^s[a-o]" --exclude "$SELF_TEST_EXCLUDE"
+  ;;
+7)
+  echo "Running self-test (7): Sp-Z"
+  ./meteor self-test --file "^s[p-z]|^[t-z]|^command-line" --exclude "$SELF_TEST_EXCLUDE"
   ;;
 esac