diff --git a/postfix/opendmarc.conf b/postfix/opendmarc.conf
index 89bce44d..8ff5ad16 100644
--- a/postfix/opendmarc.conf
+++ b/postfix/opendmarc.conf
@@ -5,4 +5,4 @@ Syslog true
 UMask 0002
 UserID opendmarc:opendmarc
 IgnoreHosts /etc/opendmarc/ignore.hosts
-HistoryFile /var/run/opendmarc/opendmarc.dat
\ No newline at end of file
+HistoryFile /var/run/opendmarc/opendmarc.dat
diff --git a/start-mailserver.sh b/start-mailserver.sh
index e5f25489..4da87c74 100644
--- a/start-mailserver.sh
+++ b/start-mailserver.sh
@@ -100,10 +100,10 @@ chmod -R 0700 /etc/opendkim/keys/
 # DMARC
 # if ther is no AuthservID create it
 if [ `cat /etc/opendmarc.conf | grep -w AuthservID | wc -l` -eq 0 ]; then
-  echo "AuthservID $hostname" >> /etc/opendmarc.conf
+  echo "AuthservID $(hostname)" >> /etc/opendmarc.conf
 fi
 if [ `cat /etc/opendmarc.conf | grep -w TrustedAuthservIDs | wc -l` -eq 0 ]; then
-  echo "TrustedAuthservIDs $hostname" >> /etc/opendmarc.conf
+  echo "TrustedAuthservIDs $(hostname)" >> /etc/opendmarc.conf
 fi
 if [ ! -f "/etc/opendmarc/ignore.hosts" ]; then
   mkdir -p /etc/opendmarc/
diff --git a/test/test.sh b/test/test.sh
index afe9f260..be7b4c74 100644
--- a/test/test.sh
+++ b/test/test.sh
@@ -69,5 +69,9 @@ assert_raises "docker exec mail_pop3 grep ': error:' /var/log/mail.log" 1
 # Testing OpenDKIM
 assert "docker exec mail cat /etc/opendkim/KeyTable | wc -l | sed -e 's/^[ \t]*//'" "2"
 
+# Testing OpenDMARC
+assert "docker exec mail cat /etc/opendmarc.conf | grep ^AuthservID | wc -l" "1"
+assert "docker exec mail cat /etc/opendmarc.conf | grep ^TrustedAuthservID | wc -l" "1"
+
 # Ending tests
 assert_end