diff --git a/tests/p_exim/0-install_exim.sh b/tests/p_exim/0-install_exim.sh
index cec2c69..4685ddc 100755
--- a/tests/p_exim/0-install_exim.sh
+++ b/tests/p_exim/0-install_exim.sh
@@ -9,7 +9,9 @@ then
   t_ServiceControl postfix stop
   t_ServiceControl sendmail stop
   sleep 3
-  t_RemovePackage postfix exim sendmail
+  t_RemovePackage postfix sendmail
+  # Fix exim.conf to not use IPv6
+  sed -i 's/\:\:1//' /etc/exim/exim.conf
   t_ServiceControl exim start
 else
   t_Log "This seems to be a C6 system - skipping"
diff --git a/tests/p_exim/exim_smtp.sh b/tests/p_exim/exim_smtp.sh
index 8a75a36..31d0ad9 100755
--- a/tests/p_exim/exim_smtp.sh
+++ b/tests/p_exim/exim_smtp.sh
@@ -6,11 +6,11 @@ t_Log "Running $0 - Exim SMTP test."
 
 if (t_GetPkgRel basesystem | grep -q el5)
 then
-  echo "helo test" | nc -w 3 localhost 25 | grep -q '250'
+  echo "helo test" | nc -i 1 -w 3 localhost 25 | grep -q '250'
   ret_val=$?
 else
   t_Log "This seems to be A C6 system - skipping"
   ret_val=0
 fi
 
-t_CheckExitStatus $?
+t_CheckExitStatus $ret_val