diff --git a/automated/linux/signaltest/signaltest.sh b/automated/linux/signaltest/signaltest.sh
index cb5478cbb..e7db4f3a2 100755
--- a/automated/linux/signaltest/signaltest.sh
+++ b/automated/linux/signaltest/signaltest.sh
@@ -31,6 +31,10 @@ done
 ! check_root && error_msg "Please run this script as root."
 create_out_dir "${OUTPUT}"
 
+if [ "${THREADS}" -eq "0" ]; then
+    THREADS=$(nproc)
+fi
+
 # Run signaltest.
 if ! binary=$(command -v signaltest); then
     detect_abi
diff --git a/automated/linux/signaltest/signaltest.yaml b/automated/linux/signaltest/signaltest.yaml
index 53949e9ad..98bc808d2 100644
--- a/automated/linux/signaltest/signaltest.yaml
+++ b/automated/linux/signaltest/signaltest.yaml
@@ -29,7 +29,9 @@ params:
     # Priority of highest prio thread.
     PRIORITY: "98"
     # Number of threads.
+    # A value of "0" will run a thread per available CPU.
     THREADS: "2"
+    # Execute cyclictest for given time
     DURATION: "1m"
     # Background workload to be run during the meassurement
     BACKGROUND_CMD: ""