diff --git a/functionality/selftest/runtest.sh b/functionality/selftest/runtest.sh
index 74f2e89..235e3c5 100755
--- a/functionality/selftest/runtest.sh
+++ b/functionality/selftest/runtest.sh
@@ -101,7 +101,7 @@ EOF
     #################### TEST PHASE ####################
     rlPhaseStartTest
         cat > $DIR/to_us << EOF
-To: $USER1@localhost
+To: $USER1@localhost.localdomain
 From: petr@here.cz
 Subject: Ein Test
 
@@ -116,7 +116,7 @@ EOF
         rlAssertGrep 'MAIL From:<root@'         $DIR/to_us.out
         rlAssertGrep "354 Enter\|354 End data"  $DIR/to_us.out
         rlAssertGrep '250.*[oO][kK]'            $DIR/to_us.out
-        rlAssertGrep "$USER1@localhost... Sent" $DIR/to_us.out
+        rlAssertGrep "$USER1@localhost.localdomain... Sent" $DIR/to_us.out
     rlPhaseEnd   
 
 
diff --git a/functionality/singlehost/main.fmf b/functionality/singlehost/main.fmf
index 53679d6..67f5de5 100644
--- a/functionality/singlehost/main.fmf
+++ b/functionality/singlehost/main.fmf
@@ -33,6 +33,7 @@ recommend:
   - procmail
   - mailx
   - nmap
+  - s-nail
 duration: 30m
 enabled: true
 tag:
diff --git a/functionality/singlehost/runtest.sh b/functionality/singlehost/runtest.sh
index 047b3e1..939be21 100755
--- a/functionality/singlehost/runtest.sh
+++ b/functionality/singlehost/runtest.sh
@@ -81,14 +81,9 @@ rlJournalStart
         rlRun "nmap -p 25 localhost"
 
         for i in `seq 1 $MAIL_SEND`; do 
-            if (rlIsRHEL '>=9' || rlIsCentOS '>=9' || rlIsFedora); then
-                rlRun "echo -e \"Subject: TEST\\\nThis is $i. test message\" | sendmail -v $USER1@localhost" 0 "Sending email"
-            else
-                mail -s test_message_subject $USER1@localhost << EOF
+                mail -s test_message_subject $USER1@localhost.localdomain << EOF
                 This is $i. test message
 EOF
-            fi
-
             sleep 0.4
         done
         sleep 60