diff --git a/AUTHORS b/AUTHORS
index bd87de8..0fa1c83 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,3 +13,4 @@ Sahil Aggarwal <sahilagg@gmail.com>
 Saager Mhatre <saager.mhatre@gmail.com>
 Iain Douglas <centos@1n6.org.uk>
 Anssi Johansson <centos@miuku.net>
+Matej Habrnal <mhabrnal@redhat.com>
diff --git a/tests/p_abrt/abrt_gpg_keys_test.sh b/tests/p_abrt/abrt_gpg_keys_test.sh
index e3e26bb..9c67b80 100755
--- a/tests/p_abrt/abrt_gpg_keys_test.sh
+++ b/tests/p_abrt/abrt_gpg_keys_test.sh
@@ -1,12 +1,15 @@
 #!/bin/sh
 # Author: Athmane Madjoudj <athmanem@gmail.com>
+#	  Christoph Galuschka <tigalch@tigalch.org>
 # Note: This was a known issue in CentOS 6.0
 # See: http://bugs.centos.org/view.php?id=4993
+# Christoph Galuschka: added functionality for C7
 
 t_Log "Running $0 -  check that abrt is using CentOS' gpg keys."
 
-if (t_GetPkgRel basesystem | grep -q el6)
-then
+if [ "$centos_ver" = "7" ] ;then
+    ls /etc/pki/rpm-gpg/ | grep -q "RPM-GPG-KEY-CentOS"
+elif [ "$centos_ver" = "6" ] ; then
     grep -q "RPM-GPG-KEY-CentOS" /etc/abrt/gpg_keys
 else 
     echo "Skipped on CentOS 5"