diff --git a/tests/p_arpwatch/arpwatch_test.sh b/tests/p_arpwatch/arpwatch_test.sh
index 982b22e..e382dd0 100755
--- a/tests/p_arpwatch/arpwatch_test.sh
+++ b/tests/p_arpwatch/arpwatch_test.sh
@@ -3,6 +3,9 @@
 
 t_Log "Running $0 - arpwatch on eth0"
 
+# Kill arpwatch instance from previous test
+killall arpwatch
+
 # getting IP-address of default gateway
 defgw=$(ip route list | grep default | cut -d' ' -f3)
 
diff --git a/tests/p_postfix/0-install_postfix.sh b/tests/p_postfix/0-install_postfix.sh
deleted file mode 100755
index 38a14e3..0000000
--- a/tests/p_postfix/0-install_postfix.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# Author: Athmane Madjoudj <athmanem@gmail.com>
-
-# Postfix
-t_InstallPackage postfix
-
-# Removing other MTA
-t_ServiceControl sendmail stop
-sleep 3
-t_RemovePackage sendmail
-if (t_GetPkgRel basesystem | grep -q el5)
-then
-  t_ServiceControl exim stop
-  sleep 3
-  t_RemovePackage exim
-fi
-
-t_ServiceControl postfix start
diff --git a/tests/p_sendmail/0-install_sendmail.sh b/tests/p_sendmail/0-install_sendmail.sh
deleted file mode 100755
index 8d072a0..0000000
--- a/tests/p_sendmail/0-install_sendmail.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# Author: Athmane Madjoudj <athmanem@gmail.com>
-
-t_InstallPackage sendmail
-
-# Remove other MTAs
-t_ServiceControl postfix stop
-sleep 3
-t_RemovePackage postfix
-if (t_GetPkgRel basesystem | grep -q el5)
-then
-  #also stoping/removing exim
-  t_ServiceControl exim stop
-  sleep 3
-  t_RemovePackage exim
-fi
-
-t_ServiceControl sendmail start