diff --git a/setup/system.sh b/setup/system.sh
index 2d5da2a5..d6fcb2da 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -408,4 +408,5 @@ EOF
 # prevent rsyslog from writing to it. Fix the ownership.
 [ -e /var/log/nsd.log ] && chown syslog:adm /var/log/nsd.log
 [ -e /var/log/mail.log ] && chown syslog:adm /var/log/mail.log
+[ -e /var/log/mail.err ] && chown syslog:adm /var/log/mail.err
 restart_service rsyslog
diff --git a/tests/suites/_mail-functions.sh b/tests/suites/_mail-functions.sh
index 007ebfbc..980a8e98 100644
--- a/tests/suites/_mail-functions.sh
+++ b/tests/suites/_mail-functions.sh
@@ -366,10 +366,6 @@ flush_logs() {
 	else
 		pid=$(/usr/bin/pidof rsyslogd)
 	fi
-	# if [ "$GITHUB_ACTIONS" = "true" ]; then
-	# 	systemctl restart rsyslog >>$TEST_OF 2>&1
-	# 	sleep 5
-	# elif [ ! -z "$pid" ]; then
 	if [ ! -z "$pid" ]; then
 		kill -HUP $pid >>$TEST_OF 2>&1
 		sleep 2