diff --git a/tests/p_centos-release/centos-release_centos-base_repos.sh b/tests/p_centos-release/centos-release_centos-base_repos.sh
index 43b3b9c..049f3bb 100755
--- a/tests/p_centos-release/centos-release_centos-base_repos.sh
+++ b/tests/p_centos-release/centos-release_centos-base_repos.sh
@@ -3,6 +3,6 @@
 
 t_Log "Running $0 - CentOS Base repos sanity test."
 
-grep "name=CentOS" /etc/yum.repos.d/CentOS-Base.repo >/dev/null 2>&1
+grep "name=CentOS" /etc/yum.repos.d/CentOS*-Base*.repo >/dev/null 2>&1
 
 t_CheckExitStatus $?
diff --git a/tests/p_centos-release/centos-release_os-release.sh b/tests/p_centos-release/centos-release_os-release.sh
index cd9d09b..fc20a2f 100755
--- a/tests/p_centos-release/centos-release_os-release.sh
+++ b/tests/p_centos-release/centos-release_os-release.sh
@@ -4,16 +4,21 @@
 t_Log "Running $0 - /etc/os-release has correct ABRT string for CentOS $centos_ver"
 
 if [ "$centos_ver" -ge 7 ];then
-  for string in CENTOS_MANTISBT_PROJECT=\"CentOS-$centos_ver\" CENTOS_MANTISBT_PROJECT_VERSION=\"$centos_ver\" REDHAT_SUPPORT_PRODUCT=\"centos\" REDHAT_SUPPORT_PRODUCT_VERSION=\"$centos_ver\"
-  do 
-    grep -q $string /etc/os-release
-    if [ $? -ne "0" ];then
-      t_Log "missing string $string in os-release file !"
-      exit 1
-    fi
-  done  
+	if [[ $centos_stream == "no" ]]; then
+	  for string in CENTOS_MANTISBT_PROJECT=\"CentOS-$centos_ver\" CENTOS_MANTISBT_PROJECT_VERSION=\"$centos_ver\" REDHAT_SUPPORT_PRODUCT=\"centos\" REDHAT_SUPPORT_PRODUCT_VERSION=\"$centos_ver\"
+	  do 
+	    grep -q $string /etc/os-release
+	    if [ $? -ne "0" ];then
+	      t_Log "missing string $string in os-release file !"
+	      exit 1
+	    fi
+	  done  
+	else
+	  echo "Skipping for CentOS Stream" ; exit 0
+	fi
 else
   echo "Skipping for CentOS 5 and 6 ..." ; exit 0
+	
 fi
 
 t_CheckExitStatus $?