diff --git a/tar-using-remote-host-via-ssh/runtest.sh b/tar-using-remote-host-via-ssh/runtest.sh
index b1b1f52..7cbe977 100755
--- a/tar-using-remote-host-via-ssh/runtest.sh
+++ b/tar-using-remote-host-via-ssh/runtest.sh
@@ -33,14 +33,15 @@
 PACKAGE="tar"
 
 rlJournalStart
-if rlIsRHEL 5 6 ;then
-sshpath=`which ssh`
-echo "DEBUG: ssh cmd $sshpath"
-ls -la $sshpath
-which ssh
-sshcmd="--rsh-command=$sshpath"
+
+if rlIsRHEL 5 6; then
+    sshpath=`which ssh`
+    echo "DEBUG: ssh cmd $sshpath"
+    ssh_tar_option="--rsh-command=$sshpath"
 else
-sshcmd=""
+    # tar on Fedora and RHEL compile in /usr/bin/ssh as the default
+    # rsh implementation
+    ssh_tar_option=
 fi
 
     rlPhaseStartSetup
@@ -58,22 +59,26 @@ fi
     rlPhaseEnd
 
     rlPhaseStartTest
-# copy&paste from http://pkgs.devel.redhat.com/cgit/tests/openssh/tree/sshd/sanity/runtest.sh
+        ssh_config=/root/.ssh/config
+        new_ssh_key="/root/.ssh/id_rsa_$username"
         rlRun "useradd $username"
         rlRun "echo $username | passwd --stdin $username"
         homedir=`getent passwd $username | awk -F: '{print $6}'`
-        ls /root/.ssh/id_rsa || ssh-keygen -t rsa -N  '' -f /root/.ssh/id_rsa
-        rlAssert0 "ssh-keygen passed" $?
+        rlRun "ssh-keygen -t rsa -N '' -f '$new_ssh_key'"
         mkdir /home/$username/.ssh
-        cat /root/.ssh/id_rsa.pub >> /home/$username/.ssh/authorized_keys
-        cat /root/.ssh/id_rsa.pub >> /root/.ssh/authorized_keys
+        cat "$new_ssh_key".pub >> /home/$username/.ssh/authorized_keys
+        cat "$new_ssh_key".pub >> /root/.ssh/authorized_keys
+        chown -R "$username:$username" "/home/$username/.ssh"
+        chmod -R og-rwx "/home/$username/.ssh"
         restorecon -R /home/$username/.ssh
+        echo "Host localhost"               >> "$ssh_config"
+        echo "  IdentityFile  $new_ssh_key" >> "$ssh_config"
     rlPhaseEnd
 
     rlPhaseStartTest
         rlAssertNotExists /tmp/mytarball.tar
         echo 'hello world' > tralalaa.petr
-        rlRun "tar $sshcmd -c -f $username@localhost:/tmp/mytarball.tar tralalaa.petr"
+        rlRun "tar $ssh_tar_option -c -f $username@localhost:/tmp/mytarball.tar tralalaa.petr"
         rlAssertExists /tmp/mytarball.tar
     rlPhaseEnd