diff --git a/tests/p_squirrelmail/0-install_squirrelmail.sh b/tests/p_squirrelmail/0-install_squirrelmail.sh
index 6905b5a..36ea64e 100755
--- a/tests/p_squirrelmail/0-install_squirrelmail.sh
+++ b/tests/p_squirrelmail/0-install_squirrelmail.sh
@@ -5,10 +5,9 @@
 # Squirellmail has been removed from el6
 
 t_Log "Running $0 - install squirrelmail"
-if (t_GetPkgRel basesystem | grep -q el6)
-then
-   t_Log It seems to be a CentOS 6.x system, this test will be disabled
-   exit 0
+if [ "$centos_ver" -gt "5" ] ;then
+  t_Log "It seems to be a CentOS $centos_ver system, this test will be disabled -> SKIP"
+  exit 0
 else
    t_InstallPackage squirrelmail 
    t_ServiceControl httpd restart
diff --git a/tests/p_squirrelmail/squirrelmail_test.sh b/tests/p_squirrelmail/squirrelmail_test.sh
index c590be8..5971c9e 100755
--- a/tests/p_squirrelmail/squirrelmail_test.sh
+++ b/tests/p_squirrelmail/squirrelmail_test.sh
@@ -2,9 +2,9 @@
 # Author: Athmane Madjoudj <athmanem@gmail.com>
 t_Log "Running $0 - test SquirrelMail URL"
 
-if (t_GetPkgRel basesystem | grep -q el6)
-then
-   t_Log It seems to be a CentOS 6.x system, this test will be disabled
+if [ "$centos_ver" -gt "5" ] ;then
+  t_Log "It seems to be a CentOS $centos_ver system, this test will be disabled -> SKIP"
+  exit 0
 else
    curl -s http://localhost/webmail/src/login.php | grep 'SquirrelMail' > /dev/null 2>&1
 fi