diff --git a/src/freedombone-utils-cron b/src/freedombone-utils-cron
index 61484f86344b3bb00e1b3ebb1f3790ed4f15fad4..193b19e86edc915d2aaee9d3f4c7103dbf897500 100755
--- a/src/freedombone-utils-cron
+++ b/src/freedombone-utils-cron
@@ -77,4 +77,11 @@ function randomize_cron {
     mark_completed $FUNCNAME
 }
 
+function schedule_stig_tests {
+    echo '#!/bin/bash' > /etc/cron.daily/stig_tests
+    echo "pkill ${PROJECT_NAME}-tests" >> /etc/cron.daily/stig_tests
+    echo '${PROJECT_NAME}-tests --stig yes' >> /etc/cron.daily/stig_tests
+    chmod +x /etc/cron.daily/stig_tests
+}
+
 # NOTE: deliberately there is no "exit 0"
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index 22003a92feee2b9db0f666534e73d25672c19c44..5b8da91c7ce010a31455931c8a9d786fc46378e3 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -751,6 +751,9 @@ function setup_utils {
 
     function_check limit_user_logins
     limit_user_logins
+
+    function_check schedule_stig_tests
+    schedule_stig_tests
 }
 
 function setup_email {