diff --git a/tests/p_kernel/01_kernel_centos_keyring.sh b/tests/p_kernel/01_kernel_centos_keyring.sh
index eeb33c5..6797457 100755
--- a/tests/p_kernel/01_kernel_centos_keyring.sh
+++ b/tests/p_kernel/01_kernel_centos_keyring.sh
@@ -11,11 +11,16 @@ if [ "$uname_arch" == "aarch64" ] || [ "$uname_arch" == "armv7l" ] || [ "$uname_
   exit 0
 fi
 
-if [ "$centos_ver" = "7" ] ; then
+if [ "$centos_ver" -ge 7 ] ; then
+  if [ "$centos_ver" -eq 7 ];then
+    ring=.system_keyring
+  else
+    ring=.builtin_trusted_keys
+  fi
   for id in kpatch "Driver update" kernel
   do
     t_Log "Verifying x.509 CentOS ${id}"
-    keyctl list %:.system_keyring | grep -i "CentOS Linux ${id} signing key" > /dev/null 2>&1
+    keyctl list %:$ring | grep -i "CentOS Linux ${id} signing key" > /dev/null 2>&1
     t_CheckExitStatus $?
   done
 else
diff --git a/tests/p_kernel/02_kernel_secureboot_signed.sh b/tests/p_kernel/02_kernel_secureboot_signed.sh
index 3a4df63..404d06d 100755
--- a/tests/p_kernel/02_kernel_secureboot_signed.sh
+++ b/tests/p_kernel/02_kernel_secureboot_signed.sh
@@ -3,7 +3,7 @@
 
 t_Log "Running $0 -  Verifying that kernel is correctly signed with correct cert"
 
-if [[ "$centos_ver" = "7" && "$arch" = "x86_64" ]] ; then
+if [[ "$centos_ver" -ge 7 && "$arch" = "x86_64" ]] ; then
   t_InstallPackage pesign 
   for kernel in $(rpm -q kernel --queryformat '%{version}-%{release}.%{arch}\n') 
     do