diff --git a/tests/p_tftp-server/10-tftp-server_get-test.sh b/tests/p_tftp-server/10-tftp-server_get-test.sh
index 2c98b62..59db0ea 100755
--- a/tests/p_tftp-server/10-tftp-server_get-test.sh
+++ b/tests/p_tftp-server/10-tftp-server_get-test.sh
@@ -3,8 +3,7 @@
 
 t_Log "Running $0 - tftp-server get file test."
 
-if (t_GetPkgRel basesystem | grep -q el6)
-then
+if [ "$centos_ver" -gt "5" ] ; then
   TFTP_DIR=/var/lib/tftpboot
 else
   TFTP_DIR=/tftpboot
diff --git a/tests/p_tftp-server/20-tftp-server_put-test.sh b/tests/p_tftp-server/20-tftp-server_put-test.sh
index d726e5b..2bfaf22 100755
--- a/tests/p_tftp-server/20-tftp-server_put-test.sh
+++ b/tests/p_tftp-server/20-tftp-server_put-test.sh
@@ -5,17 +5,13 @@
 
 t_Log "Running $0 - tftp-server put file test."
 
-dist=$(t_DistCheck)
-
-if [ "$dist" = "6" ]; then
-        setsebool tftp_anon_write 1
-        TFTP_DIR=/var/lib/tftpboot
-elif [ "$dist" = "5" ]; then
-        setsebool allow_tftp_anon_write 1
-        chcon -R -t tftpdir_rw_t /tftpboot/
-        TFTP_DIR=/tftpboot
+if [ "$centos_ver" -gt "5" ]; then
+  setsebool tftp_anon_write 1
+  TFTP_DIR=/var/lib/tftpboot
 else
-        TFTP_DIR=/tftpboot
+  setsebool allow_tftp_anon_write 1
+  chcon -R -t tftpdir_rw_t /tftpboot/
+  TFTP_DIR=/tftpboot
 fi