diff --git a/tests/p_diffutils/10-cmp-tests b/tests/p_diffutils/10-cmp-tests
old mode 100755
new mode 100644
diff --git a/tests/p_gzip/30-gzexe-test b/tests/p_gzip/30-gzexe-test
old mode 100755
new mode 100644
diff --git a/tests/p_iptables/iptables_add-remove_test.sh b/tests/p_iptables/iptables_add-remove_test.sh
index 92d97ab..04e1aeb 100755
--- a/tests/p_iptables/iptables_add-remove_test.sh
+++ b/tests/p_iptables/iptables_add-remove_test.sh
@@ -3,7 +3,7 @@
 
 t_Log "Running $0 - verify iptables can insert and delete rules"
 
-if [ "$centos_ver" = "7" ] || [ "$centos_ver" = "8" ] || [ "$centos_ver" = "9" ];then
+if [ "$centos_ver" -ge "7" ];then
  t_Log "CentOS $centos_ver uses firewalld and not iptables -> SKIP"
  t_CheckExitStatus 0
  exit 0
diff --git a/tests/p_iptables/iptables_default_rules.sh b/tests/p_iptables/iptables_default_rules.sh
index 4408c5a..25b6b7d 100755
--- a/tests/p_iptables/iptables_default_rules.sh
+++ b/tests/p_iptables/iptables_default_rules.sh
@@ -3,7 +3,7 @@
 
 t_Log "Running $0 - check iptables default rules"
 
-if [ "$centos_ver" = "7" ] || [ "$centos_ver" = "8" ] || [ "$centos_ver" = "9" ];then
+if [ "$centos_ver" -ge 7 ];then
  t_Log "CentOS $centos_ver uses firewalld and not iptables -> SKIP"
  t_CheckExitStatus 0
  exit 0
diff --git a/tests/p_iptables/iptables_function-check_test.sh b/tests/p_iptables/iptables_function-check_test.sh
index ba6664f..731ea91 100755
--- a/tests/p_iptables/iptables_function-check_test.sh
+++ b/tests/p_iptables/iptables_function-check_test.sh
@@ -4,7 +4,7 @@
 
 t_Log "Running $0 - iptables functional check - deny ping on loopback"
 
-if [ "$centos_ver" = "7" ] || [ "$centos_ver" = "8" ] || [ "$centos_ver" = "9" ];then
+if [ "$centos_ver" -ge 7 ];then
  t_Log "CentOS $centos_ver uses firewalld and not iptables -> SKIP"
  t_CheckExitStatus 0
  exit 0
diff --git a/tests/p_iptables/iptables_kmod_loaded.sh b/tests/p_iptables/iptables_kmod_loaded.sh
index 1ef0b8a..07cbf07 100755
--- a/tests/p_iptables/iptables_kmod_loaded.sh
+++ b/tests/p_iptables/iptables_kmod_loaded.sh
@@ -3,7 +3,7 @@
 
 t_Log "Running $0 - check if iptables kernel modules are loaded"
 
-if [ "$centos_ver" = "7" ]|| [ "$centos_ver" = "8" ]|| [ "$centos_ver" = "9" ];then
+if [ "$centos_ver" -ge 7 ];then
  t_Log "CentOS $centos_ver uses firewalld and not iptables -> SKIP"
  t_CheckExitStatus 0
  exit 0
diff --git a/tests/p_rsync/0-install-rsync.sh b/tests/p_rsync/0-install-rsync.sh
index afb3034..311ef89 100755
--- a/tests/p_rsync/0-install-rsync.sh
+++ b/tests/p_rsync/0-install-rsync.sh
@@ -3,14 +3,14 @@
 
 t_Log "Running $0 - installing rsync and xinetd."
 
-if [ "$centos_ver" = "8" ] || [ "$centos_ver" = "9" ] ; then
+if [ "$centos_ver" -ge 8 ]; then
   t_InstallPackage rsync rsync-daemon
 else
   t_InstallPackage xinetd rsync
 fi
 
 # Restart in case previous tests allready installed xinetd
-if [ "$centos_ver" = "7" ] || [ "$centos_ver" = "8" ] || [ "$centos_ver" = "9"] ; then
+if [ "$centos_ver" -ge 7 ]; then
  systemctl start rsyncd.service
 else
  # enable rsync in /etc/xinet.d/rsync
diff --git a/tests/p_rsync/10-rsync-test.sh b/tests/p_rsync/10-rsync-test.sh
index 8fdd8aa..b53c5bf 100755
--- a/tests/p_rsync/10-rsync-test.sh
+++ b/tests/p_rsync/10-rsync-test.sh
@@ -29,7 +29,7 @@ hosts allow = 127.0.0.1
  include = $FILE
 EOF
 
-if [ "$centos_ver" = "7" ] || [ "$centos_ver" = "8" ] || [ "$centos_ver" = "9" ]; then
+if [ "$centos_ver" -ge 7 ]; then
  systemctl start rsyncd.service
 else
  t_ServiceControl xinetd restart
@@ -47,7 +47,7 @@ t_CheckExitStatus $?
 /bin/rm $PATH2FILE/$FILE
 /bin/rm /var/log/$FILE
 
-if [ "$centos_ver" = "7" ] || [ "$centos_ver" = "8" ] || [ "$centos_ver" = "9" ]; then
+if [ "$centos_ver" -ge 7 ]; then
  systemctl start rsyncd.service
 else
  /bin/rm /etc/rsyncd.conf
diff --git a/tests/p_ruby/20-ruby-version-test.sh b/tests/p_ruby/20-ruby-version-test.sh
index 5ff8232..e1e3415 100755
--- a/tests/p_ruby/20-ruby-version-test.sh
+++ b/tests/p_ruby/20-ruby-version-test.sh
@@ -7,7 +7,7 @@
 
 t_Log "Running $0 - Check version of ruby."
 
-if [ "$centos_ver" = "9" ] ; then
+if [ "$centos_ver" -ge 9 ] ; then
   ruby -v | grep -q '3.'
   ret_val=$?
 elif [ "$centos_ver" = "8" ] ; then
diff --git a/tests/p_ruby/30-irb-version-test.sh b/tests/p_ruby/30-irb-version-test.sh
index f455f18..a324d53 100755
--- a/tests/p_ruby/30-irb-version-test.sh
+++ b/tests/p_ruby/30-irb-version-test.sh
@@ -8,7 +8,7 @@
 t_Log "Running $0 - Check version of irb."
 
 #allready prepared just in case versions should change between C5 and C6
-if [ "$centos_ver" = "9" ] ; then
+if [ "$centos_ver" -ge "9" ] ; then
   irb -v | grep -q 'irb'
   ret_val=$?
 elif [ "$centos_ver" = "7" -o "$centos_ver" = "8" ] ; then
diff --git a/tests/p_ruby/40-ri-version-test.sh b/tests/p_ruby/40-ri-version-test.sh
index b829f5b..e680c55 100755
--- a/tests/p_ruby/40-ri-version-test.sh
+++ b/tests/p_ruby/40-ri-version-test.sh
@@ -8,7 +8,7 @@
 t_Log "Running $0 - Check version of ruby ri."
 
 #allready prepared just in case versions should change between C5 and C6
-if [ "$centos_ver" = "8" -o "$centos_ver" = "9" ] ; then
+if [ "$centos_ver" -ge "8" ] ; then
   ri -v | grep -q '6.'
   ret_val=$?
 elif [ "$centos_ver" = "7" ] ; then
diff --git a/tests/p_ruby/50-rdoc-version-test.sh b/tests/p_ruby/50-rdoc-version-test.sh
index 975b100..e9262e1 100755
--- a/tests/p_ruby/50-rdoc-version-test.sh
+++ b/tests/p_ruby/50-rdoc-version-test.sh
@@ -8,7 +8,7 @@
 t_Log "Running $0 - Check version of rdoc."
 
 #allready prepared just in case versions should change between C5 and C6
-if [ "$centos_ver" = "8" -o "$centos_ver" = "9" ] ; then
+if [ "$centos_ver" -ge 8 ] ; then
   rdoc -v | grep -q '6.'
   ret_val=$?
 elif [ "$centos_ver" = "7" ] ; then