diff --git a/plans/regression.fmf b/plans/regression.fmf
index 5118650..068f1b3 100644
--- a/plans/regression.fmf
+++ b/plans/regression.fmf
@@ -37,3 +37,9 @@ adjust+:
         script:
           - dnf config-manager --set-enabled rhel-CRB
           - dnf config-manager --set-enabled rhel-buildroot
+
+  - because: "On CentOS Stream 8, debuginfo repository seems to be disabled"
+    when: distro == centos-stream-8
+    prepare+:
+      - how: shell
+        script: dnf config-manager --set-enabled debuginfo
diff --git a/tests/bugs/ppc64-segv-in-libbfd/main.fmf b/tests/bugs/ppc64-segv-in-libbfd/main.fmf
index ffcf467..f532dd0 100644
--- a/tests/bugs/ppc64-segv-in-libbfd/main.fmf
+++ b/tests/bugs/ppc64-segv-in-libbfd/main.fmf
@@ -5,6 +5,7 @@ description: |
 
 require+:
   - elfutils
+  - kernel
   - kernel-debuginfo
   - xz
 
diff --git a/tests/main.fmf b/tests/main.fmf
index 97ef72b..e3ae892 100644
--- a/tests/main.fmf
+++ b/tests/main.fmf
@@ -119,6 +119,8 @@ adjust+:
   - when: distro == rhel-8 and collection is not defined
     require+:
       - binutils
+      - binutils-devel
+      - binutils-gold
       - gcc
       - gcc-c++
       - annobin
@@ -207,6 +209,8 @@ adjust+:
   - when: distro == centos-stream-9 and collection is not defined
     require+:
       - binutils
+      - binutils-devel
+      - binutils-gold
       - gcc
       - gcc-c++
       - annobin
@@ -224,6 +228,7 @@ adjust+:
   - when: distro == centos-stream-8 and collection is not defined
     require+:
       - binutils
+      - binutils-devel
       - gcc
       - gcc-c++
       - annobin
@@ -234,7 +239,58 @@ adjust+:
       GCC_PACKAGE: gcc
 
   # CentOS Stream 8 / gcc-toolset-13
+  - when: distro == centos-stream-8 and collection == gcc-toolset-13 and arch == x86_64,aarch64
+    require+:
+      - gcc-toolset-13-binutils
+      - gcc-toolset-13-binutils-devel
+      - gcc-toolset-13-binutils-gold
+      # TODO: why is it missing, not being shipped?
+      # - gcc-toolset-13-binutils-gprofng
+      - gcc-toolset-13-gcc
+      - gcc-toolset-13-gcc-c++
+      - gcc-toolset-13-gcc-plugin-annobin
+    environment+:
+      PACKAGES: gcc-toolset-13-binutils
+      _REQUIRES: gcc-toolset-13-gcc gcc-toolset-13-gcc-c++ gcc-toolset-13-gcc-plugin-annobin glibc
+      WITH_SCL: scl enable gcc-toolset-13
+      BINUTILS_PACKAGE: gcc-toolset-13-binutils
+      GCC_PACKAGE: gcc-toolset-13-gcc
+      COLLECTION_PACKAGES: gcc-toolset-13-binutils gcc-toolset-13-binutils-devel gcc-toolset-13-binutils-gold
+
+  - when: distro == centos-stream-8 and collection == gcc-toolset-13 and arch != x86_64,aarch64
+    require+:
+      - gcc-toolset-13-binutils
+      - gcc-toolset-13-binutils-devel
+      - gcc-toolset-13-binutils-gold
+      - gcc-toolset-13-gcc
+      - gcc-toolset-13-gcc-c++
+      - gcc-toolset-13-gcc-plugin-annobin
+    environment+:
+      PACKAGES: gcc-toolset-13-binutils
+      _REQUIRES: gcc-toolset-13-gcc gcc-toolset-13-gcc-c++ gcc-toolset-13-gcc-plugin-annobin glibc
+      WITH_SCL: scl enable gcc-toolset-13
+      BINUTILS_PACKAGE: gcc-toolset-13-binutils
+      GCC_PACKAGE: gcc-toolset-13-gcc
+      COLLECTION_PACKAGES: gcc-toolset-13-binutils gcc-toolset-13-binutils-devel gcc-toolset-13-binutils-gold
+
   # CentOS Stream 8 / gcc-toolset-12
+  - when: distro == centos-stream-8 and collection == gcc-toolset-12
+    require+:
+      - gcc-toolset-12-binutils
+      - gcc-toolset-12-binutils-devel
+      - gcc-toolset-12-binutils-gold
+      - gcc-toolset-12-gcc
+      - gcc-toolset-12-gcc-c++
+      - gcc-toolset-12-gcc-plugin-annobin
+      - gcc-toolset-12-annobin-plugin-gcc
+    environment+:
+      PACKAGES: gcc-toolset-12-binutils
+      _REQUIRES: gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-gcc-plugin-annobin gcc-toolset-12-annobin-plugin-gcc glibc
+      WITH_SCL: scl enable gcc-toolset-12
+      BINUTILS_PACKAGE: gcc-toolset-12-binutils
+      GCC_PACKAGE: gcc-toolset-12-gcc
+      COLLECTION_PACKAGES: gcc-toolset-12-binutils gcc-toolset-12-binutils-devel gcc-toolset-12-binutils-gold
+
   # CentOS Stream 8 / gcc-toolset-11
 
   # Fedora Rawhide / no collection
diff --git a/tests/supported-targets/main.fmf b/tests/supported-targets/main.fmf
index 7d82fbb..6cf5c60 100644
--- a/tests/supported-targets/main.fmf
+++ b/tests/supported-targets/main.fmf
@@ -4,3 +4,12 @@ duration: 10m
 
 contact+:
   - Arjun Shankar <ashankar@redhat.com>
+
+adjust+:
+  - when: distro == centos-stream-9
+    environment+:
+        BASELINE: "9"
+
+  - when: distro == centos-stream-8
+    environment+:
+        BASELINE: "8"
diff --git a/tests/supported-targets/test.sh b/tests/supported-targets/test.sh
index cd3e753..e73a2e1 100755
--- a/tests/supported-targets/test.sh
+++ b/tests/supported-targets/test.sh
@@ -36,6 +36,14 @@ rlJournalStart
     rlPhaseStartSetup
         buTestHeader
 
+        if [ -z "$BASELINE" ]; then
+            rlLog "$(cat /etc/redhat-release)"
+            rlFail "No baseline available for this major release; using RHEL-7 as baseline"
+            BASELINE=7
+        fi
+
+        rlLogInfo "BASELINE=$BASELINE"
+
         if rlIsRHEL "=6"; then
           release=6
         elif rlIsRHEL "=7"; then
@@ -44,6 +52,10 @@ rlJournalStart
           release=8
         elif rlIsRHEL "=9"; then
           release=9
+        elif rlIsCentOS "=8"; then
+          release=8
+        elif rlIsCentOS "=9"; then
+          release=9
         else
           rlLog "$(cat /etc/redhat-release)"
           rlFail "No Baseline available for this major release; using RHEL-7 as baseline"