diff --git a/.github/test-spec.yml b/.github/test-spec.yml
index c590c4a8fac..2f5f8478c89 100644
--- a/.github/test-spec.yml
+++ b/.github/test-spec.yml
@@ -148,16 +148,40 @@
   - "modules/mbedtls/**/*"
 
 "CI-fem-test":
+  - "samples/net/sockets/echo_*/**/*"
   - any:
-      - "**/*"
-      - "!samples/bluetooth/**/*"
-      - "!tests/bluetooth/**/*"
+      - "!.github/**/*"
+      - "!doc/**/*"
+      - "!CODEOWNERS"
+      - "!LICENSE"
+      - "!**/*.rst"
+      - "!VERSION"
+      - "!SDK_VERSION"
+      - "!MAINTAINERS.yml"
+      - "!version.h.in"
+      - "!Jenkinsfile"
+      - "!**/*.md"
+      - "!tests/**/*"
+      - "!samples/**/*"
+      - "!scripts/**/*"
 
 "CI-rs-test":
+  - "samples/net/sockets/echo_*/**/*"
   - any:
-      - "**/*"
-      - "!samples/bluetooth/**/*"
-      - "!tests/bluetooth/**/*"
+      - "!.github/**/*"
+      - "!doc/**/*"
+      - "!CODEOWNERS"
+      - "!LICENSE"
+      - "!**/*.rst"
+      - "!VERSION"
+      - "!SDK_VERSION"
+      - "!MAINTAINERS.yml"
+      - "!version.h.in"
+      - "!Jenkinsfile"
+      - "!**/*.md"
+      - "!tests/**/*"
+      - "!samples/**/*"
+      - "!scripts/**/*"
 
 "CI-thread-test":
   - "include/zephyr/net/**/*"