diff --git a/tests/p_ruby/0-install-ruby.sh b/tests/p_ruby/0-install-ruby.sh
index 1a3f4ec..1d46ad8 100755
--- a/tests/p_ruby/0-install-ruby.sh
+++ b/tests/p_ruby/0-install-ruby.sh
@@ -5,5 +5,9 @@
 # Author: Saager Mhatre <saager.mhatre@gmail.com>
 
 t_Log "Running $0 - attempting to install ruby, ruby-irb, ruby-ri and ruby-rdoc4"
+if [ "$centos_ver" -ge 8 ] ; then
+t_InstallPackage ruby ruby-irb rubygem-rdoc
+else
 t_InstallPackage ruby ruby-irb ruby-ri ruby-rdoc
+fi
 
diff --git a/tests/p_ruby/20-ruby-version-test.sh b/tests/p_ruby/20-ruby-version-test.sh
index 7ff529f..961e17a 100755
--- a/tests/p_ruby/20-ruby-version-test.sh
+++ b/tests/p_ruby/20-ruby-version-test.sh
@@ -7,7 +7,10 @@
 
 t_Log "Running $0 - Check version of ruby."
 
-if [ "$centos_ver" = "7" ] ; then
+if [ "$centos_ver" = "8" ] ; then
+  ruby -v | grep -q '2.5'
+  ret_val=$?
+elif [ "$centos_ver" = "7" ] ; then
   ruby -v | grep -q '2.0'
   ret_val=$?
 elif [ "$centos_ver" = "6" ] ; then
diff --git a/tests/p_ruby/30-irb-version-test.sh b/tests/p_ruby/30-irb-version-test.sh
index ac7a88e..853e73f 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" = "7" ] ; then
+if [ "$centos_ver" = "7" -o "$centos_ver" = "8" ] ; then
   irb -v | grep -q '0.9.6'
   ret_val=$?
 else
diff --git a/tests/p_ruby/40-ri-version-test.sh b/tests/p_ruby/40-ri-version-test.sh
index 75acf70..4378892 100755
--- a/tests/p_ruby/40-ri-version-test.sh
+++ b/tests/p_ruby/40-ri-version-test.sh
@@ -8,7 +8,10 @@
 t_Log "Running $0 - Check version of ruby ri."
 
 #allready prepared just in case versions should change between C5 and C6
-if [ "$centos_ver" = "7" ] ; then
+if [ "$centos_ver" = "8" ] ; then
+  ri -v | grep -q '6.0'
+  ret_val=$?
+elif [ "$centos_ver" = "7" ] ; then
   ri -v | grep -q '4.0'
   ret_val=$?
 else
diff --git a/tests/p_ruby/50-rdoc-version-test.sh b/tests/p_ruby/50-rdoc-version-test.sh
index cf7a440..666d290 100755
--- a/tests/p_ruby/50-rdoc-version-test.sh
+++ b/tests/p_ruby/50-rdoc-version-test.sh
@@ -8,7 +8,10 @@
 t_Log "Running $0 - Check version of rdoc."
 
 #allready prepared just in case versions should change between C5 and C6
-if [ "$centos_ver" = "7" ] ; then
+if [ "$centos_ver" = "8" ] ; then
+  rdoc -v | grep -q '6.0'
+  ret_val=$?
+elif [ "$centos_ver" = "7" ] ; then
   t_Log "CentOS $centos_ver rdoc has no version in cli -> SKIP"
   t_CheckExitStatus 0
   exit 0