diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83be8f81c70c3a404562ad588826098fa4a29a53..72efc289460adfbc3428c3e818c57c8ba238d758 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,12 +5,6 @@ stages:
 # If you change stuff here, you probably also need to change stuff in:
 #  https://gitlab.cern.ch/linuxsupport/websites/linuxops/-/blob/master/docs/distributions/openstack.md
 variables:
-  TEST_OS7:
-    value: 'False'
-    description: 'Test CentOS 7 [True|False]'
-    options:
-      - "True"
-      - "False"
   TEST_OS8al:
     value: 'False'
     description: 'Test AlmaLinux 8 [True|False]'
@@ -24,12 +18,6 @@ variables:
       - "True"
       - "False"
   # Only test RH images on demand
-  TEST_OSRH7:
-    value: 'False'
-    description: 'Test Red Hat Enterprise Linux 7 [True|False]'
-    options:
-      - "True"
-      - "False"
   TEST_OSRH8:
     value: 'False'
     description: 'Test Red Hat Enterprise Linux 8 [True|False]'
@@ -44,7 +32,7 @@ variables:
       - "False"
   IMAGE:
     value: ''
-    description: 'Image UUID to test. NOTE: if you set this, you must also set ONLY ONE of [TEST_OS7, TEST_OS8s, TEST_OS8al, TEST_OS9, TEST_OS9al, TEST_OSRH7, TEST_OSRH8] to True, the correct one for the given image. If it is empty, the latest image will be used.'
+    description: 'Image UUID to test. NOTE: if you set this, you must also set ONLY ONE of [TEST_OS8s, TEST_OS8al, TEST_OS9, TEST_OS9al, TEST_OSRH8, TEST_OSRH9] to True, the correct one for the given image. If it is empty, the latest image will be used.'
   TEST_PHYSICAL:
     value: 'False'
     description: 'Test on physical machines [True|False]'
@@ -102,10 +90,8 @@ include:
   # Common scripts for both distributions
   - local: '/ci/common.yml'
   # Specific customisations according to distro
-  - local: '/ci/cc7.yml'
   - local: '/ci/alma8.yml'
   - local: '/ci/alma9.yml'
   # Specific customisations for RH, we only test managed systems
-  - local: '/ci/rh7.yml'
   - local: '/ci/rh8.yml'
   - local: '/ci/rh9.yml'
diff --git a/README.md b/README.md
index 8d9b619eef2aa0028c5422df29ed9b78d8c2cc14..850c3ece1428cb1d308c16ef20b9a751da2ab879 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,6 @@ Puppet jobs have to be run on custom runners (hostgroup `punch/cirunners`) manag
 * `TEST_PHYSICAL`: Test using physical machines. Defaults to `False`.
 * `TEST_UNMANAGED`: Create unmanaged machines. Defaults to `True`.
 * `TEST_PUPPET`: Create Puppet-managed machines. Defaults to `False`.
-* `TEST_OS7`: Test the CC7 image. Defaults to `True`.
-* `TEST_OSRH7`: Test the RH7 image. Defaults to `False`.
 * `TEST_OSRH8`: Test the RH8 image. Defaults to `False`.
 * `TEST_OSRH9`: Test the RH9 image. Defaults to `False`.
 * `TEST_OS8al`: Test the ALMA8 image. Defaults to `False`.
@@ -38,10 +36,8 @@ In order to run any tests, there must be *at least one* `True` value in *each* o
 
 | **OS version** | **Machine type** | **Environment**  | **Architecture** |
 |----------------|------------------|------------------|------------------|
-| `TEST_OS7`     | `TEST_VIRTUAL`   | `TEST_UNMANAGED` | `TEST_X86_64`    |
-| `TEST_OSRH7`   | `TEST_PHYSICAL`  | `TEST_PUPPET`    | `TEST_AARCH64`   |
-| `TEST_OSRH8`   |                  |                  |                  |
-| `TEST_OSRH9`   |                  |                  |                  |
+| `TEST_OSRH8`   | `TEST_VIRTUAL`   | `TEST_UNMANAGED` | `TEST_X86_64`    |
+| `TEST_OSRH9`   | `TEST_PHYSICAL`  | `TEST_PUPPET`    | `TEST_AARCH64`   |
 | `TEST_OS8al`   |                  |                  |                  |
 | `TEST_OS9al`   |                  |                  |                  |
 
diff --git a/cerncentostests.sh b/cerncentostests.sh
index 4578c1724793c5e0db6b5c61d2f1b93ba20208d1..54084aa2d658d2ef93ebf37c76b7d4581cf306ff 100644
--- a/cerncentostests.sh
+++ b/cerncentostests.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 # The following script runs CERN CentOS functional tests
 
-yum install git cern-linuxsupport-access -y
+dnf install git cern-linuxsupport-access -y
 
 cern-linuxsupport-access enable
 git clone https://gitlab.cern.ch/linuxsupport/testing/cern_centos_functional_tests.git
 cd cern_centos_functional_tests
 git log -1
 
-./runtests.sh
\ No newline at end of file
+./runtests.sh
diff --git a/ci/cc7.yml b/ci/cc7.yml
deleted file mode 100644
index 2b81c97e28ca16acefec38fca12d88d39e25efcb..0000000000000000000000000000000000000000
--- a/ci/cc7.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-cc7_unman_physical_x86_64:
-  extends: .test_unmanaged_physical
-  variables:
-    OS: 7
-    ARCH: x86_64
-  only:
-    variables:
-      - $TEST_OS7 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_UNMANAGED == 'True' && $TEST_X86_64 == 'True'
-
-cc7_unman_virtual_x86_64:
-  extends: .test_unmanaged_virtual
-  variables:
-    OS: 7
-    ARCH: x86_64
-    DELETE_FAILURES: "False"
-  only:
-    variables:
-      - $TEST_OS7 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_UNMANAGED == 'True' && $TEST_X86_64 == 'True'
-
-cc7_puppet_physical_x86_64:
-  extends: .test_puppet_physical
-  variables:
-    OS: 7
-    ARCH: x86_64
-  only:
-    variables:
-      - $TEST_OS7 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_PUPPET == 'True' && $TEST_X86_64 == 'True'
-
-cc7_puppet_virtual_x86_64:
-  extends: .test_puppet_virtual
-  variables:
-    OS: 7
-    ARCH: x86_64
-  only:
-    variables:
-      - $TEST_OS7 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True' && $TEST_X86_64 == 'True'
diff --git a/ci/common.yml b/ci/common.yml
index c1879d8e8aa3168f440acdeee221e3b1773d1f86..194a0be6534411332855e516ce1bb9e052f69e20 100644
--- a/ci/common.yml
+++ b/ci/common.yml
@@ -22,31 +22,20 @@
 .get_latest_image: &get_latest_image
   - |
     if [[ -z "${IMAGE}" ]]; then
-      if [[ "${OS}" == "RH7" ]]; then
+      # CentOS, Alma and RHEL {8,9} images are public, so we add an extra parameter for finer searching
+      OS_VISIBILITY="--public"
+      if [[ "${OS: -1}" == "s" ]]; then
+        OS_DISTRO="CS"
+        OS_MAJOR="${OS:0:-1}"
+      elif [[ "${OS:0:4}" == "ALMA" ]]; then
+        OS_DISTRO="${OS:0:4}"
+        OS_MAJOR="${OS: -1}"
+      elif [[ "${OS:0:2}" == "RH" ]]; then
         OS_DISTRO="RHEL"
         OS_MAJOR="${OS: -1}"
-        # RHEL images are marked community
-        OS_VISIBILITY="--community"
       else
-        # CentOS, Alma and RHEL {8,9} images are public, so we add an extra parameter for finer searching
-        OS_VISIBILITY="--public"
-        if [[ "${OS: -1}" == "s" ]]; then
-          OS_DISTRO="CS"
-          OS_MAJOR="${OS:0:-1}"
-        elif [[ "${OS:0:4}" == "ALMA" ]]; then
-          OS_DISTRO="${OS:0:4}"
-          OS_MAJOR="${OS: -1}"
-        elif [[ "${OS:0:2}" == "RH" ]]; then
-          OS_DISTRO="RHEL"
-          OS_MAJOR="${OS: -1}"
-        else
-          OS_MAJOR="${OS}"
-          if [[ "${OS}" -eq 7 ]]; then
-            OS_DISTRO="CC"
-          else
-            OS_DISTRO="C"
-          fi
-        fi
+        OS_MAJOR="${OS}"
+        OS_DISTRO="C"
       fi
 
       for OS_EDITION in ${EDITION:-Base Test}; do
@@ -95,7 +84,7 @@
     - puppet
   script:
     - export OS_PROJECT_NAME="${PROJECT_PHYSICAL}"
-    - yum install -y openssh-clients jq nc
+    - dnf install -y openssh-clients jq nc
     - *get_latest_image
     - echo bash testallthethings.sh -d "${OS_DISTRO}" -m "${OS_MAJOR}" -a "${ARCH}" -i "${IMAGE}" -f "${FLAVOR}" -p
     - bash testallthethings.sh -d "${OS_DISTRO}" -m "${OS_MAJOR}" -a "${ARCH}" -i "${IMAGE}" -f "${FLAVOR}" -p | tee -a output.log
@@ -108,7 +97,7 @@
     - puppet
   script:
     - export OS_PROJECT_NAME="${PROJECT_VIRTUAL}"
-    - yum install -y openssh-clients jq nc
+    - dnf install -y openssh-clients jq nc
     - *get_latest_image
     - *get_smallest_flavor
     - echo bash testallthethings.sh -d "${OS_DISTRO}" -m "${OS_MAJOR}" -a "${ARCH}" -i "${IMAGE}" -f "${FLAVOR}" -p
diff --git a/ci/rh7.yml b/ci/rh7.yml
deleted file mode 100644
index f3f6f0e0fb56f08535c5c32daea40593f1a0ec6f..0000000000000000000000000000000000000000
--- a/ci/rh7.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-rh7_unman_physical_x86_64:
-  extends: .test_unmanaged_physical
-  variables:
-    OS: RH7
-    ARCH: x86_64
-  only:
-    variables:
-      - $TEST_OSRH7 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_UNMANAGED == 'True' && $TEST_X86_64 == 'True'
-
-rh7_unman_virtual_x86_64:
-  extends: .test_unmanaged_virtual
-  variables:
-    OS: RH7
-    ARCH: x86_64
-  only:
-    variables:
-      - $TEST_OSRH7 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_UNMANAGED == 'True' && $TEST_X86_64 == 'True'
-
-rh7_puppet_physical_x86_64:
-  extends: .test_puppet_physical
-  variables:
-    OS: RH7
-    ARCH: x86_64
-  only:
-    variables:
-      - $TEST_OSRH7 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_PUPPET == 'True' && $TEST_X86_64 == 'True'
-
-rh7_puppet_virtual_x86_64:
-  extends: .test_puppet_virtual
-  variables:
-    OS: RH7
-    ARCH: x86_64
-  only:
-    variables:
-      - $TEST_OSRH7 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True' && $TEST_X86_64 == 'True'
diff --git a/common.sh b/common.sh
index c0502d857a37558c196c5ca183f6e29d617c7f60..0cf86f7972d64a4936031c4dfa4237c56928eefc 100644
--- a/common.sh
+++ b/common.sh
@@ -89,13 +89,8 @@ function cloudInitLogsRetrieval() {
   local AUTH1="-o PreferredAuthentications=publickey -i imageci.pem"
   local AUTH2="-o PreferredAuthentications=gssapi-with-mic"
 
-  # RHEL 7 stores cloud init info on /var/log/messages directly
-  if [[ "$OS_DISTRO" == "RHEL" && $OS_MAJOR -eq 7 ]]; then
-    CLOUD_INIT_EXTRACT_CMD="grep 'cloud-init: ' /var/log/messages"
-  else
-    # Try getting cloud init logs from the default location
-    CLOUD_INIT_EXTRACT_CMD="cat /var/log/cloud-init-output.log"
-  fi
+  # Try getting cloud init logs from the default location
+  CLOUD_INIT_EXTRACT_CMD="cat /var/log/cloud-init-output.log"
 
   # Let's see if we can get in with the SSH key
   if $SSH $AUTH1 root@"${NAME}" "uname -a; uptime; ip addr show dev eth0" 2>/dev/null; then
diff --git a/puppettests.sh b/puppettests.sh
index be2c04a6e2b6b8e94321c9ae32d433d74e801e74..18a77aadfc505768e33d5a826d717c6f1a855069 100644
--- a/puppettests.sh
+++ b/puppettests.sh
@@ -11,7 +11,7 @@ function t_CheckExitStatus {
   return 1
 }
 
-yum install -y bc
+dnf install -y bc
 
 # Now run Puppet up to MAX_RUNS times. At some point before that, it needs to return
 # status code 0 indicating that there were no changes.
diff --git a/testallthethings.sh b/testallthethings.sh
index fc96cace9d1ec84c1e69ddeb2b12c7fc816ac171..80dc93f8faa63c34179f5324c3487cbe9a4f7dc8 100755
--- a/testallthethings.sh
+++ b/testallthethings.sh
@@ -9,7 +9,7 @@ Test an Openstack image.
 
     -h                 Display this help and exit
     -d OS_DISTRO       Distro to test. Possible values C, CC, CS, RHEL, ALMA.
-    -m OS_MAJOR        Distro major to test: 7, 8, etc.
+    -m OS_MAJOR        Distro major to test: 8, 9 etc.
     -i IMAGE           Openstack image to test.
     -f FLAVOR          Openstack flavor to test. If not specified, test all available Ironic flavors.
     -a ARCH            Architecture to test. Default: x86_64.
@@ -422,31 +422,21 @@ while [[ ${#TOBETESTED[@]} -gt 0 ]]; do
 
       t_Log "Now run our own tests"
       testStart "${TESTTYPE}-${flavor}" "cern_centos_tests"
-      if [[ $OS_DISTRO == 'RHEL' && "$centos_ver" -eq 7 ]]; then
-        testAddComments "${TESTTYPE}-${flavor}" "cern_centos_tests" "CERN tests skipped as image is upstream RHEL"
-        testEnd "${TESTTYPE}-${flavor}" "cern_centos_tests" $TEST_SKIPPED
+      runOnServer "${p_name}" "IMAGECI_USER='$IMAGECI_USER' IMAGECI_PWD='$IMAGECI_PWD' bash -s" < ./cerncentostests.sh
+      g=$?
+      GLOBAL_RETURN=$((GLOBAL_RETURN+g))
+      t_CheckExitStatus $g
+      if [[ $g -ne 0 ]]; then
+        testEnd "${TESTTYPE}-${flavor}" "cern_centos_tests" $TEST_FAIL
+        testAddComments "${TESTTYPE}-${flavor}" "cern_centos_tests" "CERN tests failed"
+        testEnd "${TESTTYPE}-${flavor}" "summary" $TEST_FAIL
+      else
+        testEnd "${TESTTYPE}-${flavor}" "cern_centos_tests" $TEST_PASS
         if [[ $upstream_status -eq 0 ]]; then
           testEnd "${TESTTYPE}-${flavor}" "summary" $TEST_PASS
         else
           testEnd "${TESTTYPE}-${flavor}" "summary" $TEST_FAIL
         fi
-      else
-        runOnServer "${p_name}" "IMAGECI_USER='$IMAGECI_USER' IMAGECI_PWD='$IMAGECI_PWD' bash -s" < ./cerncentostests.sh
-        g=$?
-        GLOBAL_RETURN=$((GLOBAL_RETURN+g))
-        t_CheckExitStatus $g
-        if [[ $g -ne 0 ]]; then
-          testEnd "${TESTTYPE}-${flavor}" "cern_centos_tests" $TEST_FAIL
-          testAddComments "${TESTTYPE}-${flavor}" "cern_centos_tests" "CERN tests failed"
-          testEnd "${TESTTYPE}-${flavor}" "summary" $TEST_FAIL
-        else
-          testEnd "${TESTTYPE}-${flavor}" "cern_centos_tests" $TEST_PASS
-          if [[ $upstream_status -eq 0 ]]; then
-            testEnd "${TESTTYPE}-${flavor}" "summary" $TEST_PASS
-          else
-            testEnd "${TESTTYPE}-${flavor}" "summary" $TEST_FAIL
-          fi
-        fi
       fi
 
       t_Log "Retrieve cloud-init logs"
diff --git a/upstreamcentostests.sh b/upstreamcentostests.sh
index 9c211dcffd502de2e644ce49b704f660ac3f8f12..0d81a81df5d41e2fff354e49c3d8c89969be1684 100644
--- a/upstreamcentostests.sh
+++ b/upstreamcentostests.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # The following script runs Upstream CentOS functional tests with some tweaks
 
-yum install git jq patch cern-linuxsupport-access -y
+dnf install git jq patch cern-linuxsupport-access -y
 RET=$?
 if [[ $RET -ne 0 ]]; then
   echo "Failed to install required packages, maybe a problem with the repository configuration?"
@@ -38,25 +38,19 @@ cat > ./skipped-tests.list  <<DELIM
 8|tests/p_gzip/30-gzexe-test|https://apps.centos.org/kanboard/project/23/task/833
 8|tests/p_diffutils/10-cmp-tests|https://bugzilla.redhat.com/show_bug.cgi?id=1732960
 9|tests/p_diffutils/10-cmp-tests|https://bugzilla.redhat.com/show_bug.cgi?id=1732960
-7|tests/0_common/00_centos_repos.sh|We want to keep CERN repos enabled
 8|tests/0_common/00_centos_repos.sh|We want to keep CERN repos enabled
 9|tests/0_common/00_centos_repos.sh|We want to keep CERN repos enabled
-7|tests/0_common/20_upgrade_all.sh|Avoid too much noise on CI logs
 8|tests/0_common/20_upgrade_all.sh|Avoid too much noise on CI logs
 9|tests/0_common/20_upgrade_all.sh|Avoid too much noise on CI logs
-7|tests/0_common/30_dns_works.sh|We spawn VM without waiting for DNS register
 8|tests/0_common/30_dns_works.sh|We spawn VM without waiting for DNS register
 9|tests/0_common/30_dns_works.sh|We spawn VM without waiting for DNS register
-7|tests/0_common/50_test_comps.sh|No need to test this here
 8|tests/0_common/50_test_comps.sh|No need to test this here
 9|tests/0_common/50_test_comps.sh|No need to test this here
 9|tests/p_amanda/*|No amanda
 9|tests/p_anaconda/*|No Anaconda patch
-7|tests/p_arpwatch/*|It is omitted in cc7 anyway
 8|tests/p_arpwatch/*|arpwatch always ends up in coredump in c8
 9|tests/p_arpwatch/*|No arpwatch
 9|tests/p_centos-release/centos-release_centos-base_repos.sh|Changed repo files
-7|tests/p_cron/*|Avoid spamming VM owner with cron tests
 8|tests/p_cron/*|Avoid spamming VM owner with cron tests
 9|tests/p_cron/*|Avoid spamming VM owner with cron tests
 9|tests/p_curl/0-install_curl.sh|Curl already installed, curl-minimal conflicts with curl
@@ -67,27 +61,22 @@ cat > ./skipped-tests.list  <<DELIM
 9|tests/p_gzip/*|No ncompress
 8|tests/p_httpd/*|httpd results in 403 for all requests, disabling for now
 9|tests/p_httpd/*|httpd results in 403 for all requests, disabling for now
-7|tests/p_ipa-server/*|No Freeipa default tests, also, we use cern-get-keytab
 8|tests/p_ipa-server/*|No Freeipa default tests, also, we use cern-get-keytab
 9|tests/p_ipa-server/*|No Freeipa default tests, also, we use cern-get-keytab
 9|tests/p_iptables/*|No iptables
-7|tests/p_iputils/*|Traceroute can fail for unknown reasons
 8|tests/p_iputils/*|Traceroute can fail for unknown reasons
 9|tests/p_iputils/*|Traceroute can fail for unknown reasons
 9|tests/p_java-openjdk/*|No java-openjdk 1.6
 9|tests/p_libxml2-python/*|No python36
 9|tests/p_lsb/*|No redhat-lsb in CS9
 9|tests/p_mailman/*|No mailman
-7|tests/p_mtr/mtr_test.sh|IPv6 fails too often
 8|tests/p_mtr/mtr_test.sh|IPv6 fails too often
 9|tests/p_mtr/mtr_test.sh|IPv6 fails too often
-7|tests/p_ntp/*|We have our own NTP servers, checking in a separate test
 8|tests/p_ntp/*|We have our own NTP servers, checking in a separate test
 9|tests/p_ntp/*|We have our own NTP servers, checking in a separate test
 9|tests/p_net-snmp/*|Not working on 9
 9|tests/p_openssh/sshd_user_login-with-key.sh|invalid key length for 1024-length-keys. /etc/crypto-policies/back-ends/openssh.config
 9|tests/p_php_*/*|No php 7.2 or 7.3
-7|tests/p_postfix/*|No postfix tests are required, avoid spamming node owner
 8|tests/p_postfix/*|No postfix tests are required, avoid spamming node owner
 9|tests/p_postfix/*|No postfix tests are required, avoid spamming node owner
 9|tests/p_postgresql/*|Skipping postgresql tests
@@ -101,29 +90,22 @@ cat > ./skipped-tests.list  <<DELIM
 9|tests/p_ruby/50-rdoc-version-test.sh|Doesn't know about ruby 3.0
 9|tests/p_screen/*|Screen comes from EPEL, no EPEL yet
 9|tests/p_selinux/*|No libselinux-python
-7|tests/p_sendmail/*|No mail tests are required, avoid spamming node owner
 8|tests/p_sendmail/*|No mail tests are required, avoid spamming node owner
 9|tests/p_sendmail/*|No mail tests are required, avoid spamming node owner
 9|tests/p_setup/group_file_test.sh|Test doesn't know CS9's nobody group id
 9|tests/p_setup/passwd_file_test.sh|Test doesn't know CS9's nobody group id
-7|tests/p_squid/*|squid seems to fail from time to time, disabling for now
 8|tests/p_squid/*|squid seems to always fail, disabling for now
 9|tests/p_squid/*|squid seems to always fail, disabling for now
 9|tests/p_tftp-server/*|No xinetd
-7|tests/p_tomcat/*|tomcat_manager_test.sh fails. Excluding (tomcat is not important for us).
 9|tests/p_tomcat/*|No Tomcat
-7|tests/p_yum-plugin-fastestmirror/*|CERN CentOS does not have mirror list enabled
 8|tests/p_yum-plugin-fastestmirror/*|CERN CentOS does not have mirror list enabled
 9|tests/p_yum-plugin-fastestmirror/*|CERN CentOS does not have mirror list enabled
-7|tests/r_check_mod_packages/*|Does not apply for CCentOS
 8|tests/r_check_mod_packages/*|Does not apply for CCentOS
 9|tests/r_check_mod_packages/*|Does not apply for CCentOS
 8|tests/r_lamp/*|Fails too often
 9|tests/r_lamp/*|Fails too often
-7|tests/z_rpminfo/*|Does not apply in our case
 8|tests/z_rpminfo/*|Does not apply in our case
 9|tests/z_rpminfo/*|Does not apply in our case
-7|tests/z_repoclosure/*|No need to test this here
 8|tests/z_repoclosure/*|No need to test this here
 9|tests/z_repoclosure/*|No need to test this here
 DELIM
@@ -139,43 +121,26 @@ fi
 # Disable obvious CentOS jobs for elc distros ...
 if [ "$DISTRO_NAME" != "CentOS Linux" ]; then
   # Performs tests on /etc/centos-release and friends
-  echo "7|tests/p_centos-release/*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "8|tests/p_centos-release/*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "9|tests/p_centos-release/*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
-  echo "7|tests/p_lsb/lsb_release_brand_test*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "8|tests/p_lsb/lsb_release_brand_test*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "9|tests/p_lsb/lsb_release_brand_test*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
-  echo "7|tests/p_httpd/httpd_centos_brand_*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "8|tests/p_httpd/httpd_centos_brand_*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "9|tests/p_httpd/httpd_centos_brand_*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
-  echo "7|tests/p_lynx/lynx_default_page_centos_test.sh|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "8|tests/p_lynx/lynx_default_page_centos_test.sh|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "9|tests/p_lynx/lynx_default_page_centos_test.sh|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   # Checks if the kernel secure boot signing key is 'CentOS'
-  echo "7|tests/p_kernel/*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "8|tests/p_kernel/*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "9|tests/p_kernel/*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
-  echo "7|tests/p_shim/*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "8|tests/p_shim/*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "9|tests/p_shim/*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "8|tests/p_grub2/01_grub2_secureboot_signed.sh|Incorrect certificate" >> ./skipped-tests.list
   echo "9|tests/p_grub2/01_grub2_secureboot_signed.sh|Incorrect certificate" >> ./skipped-tests.list
   # Uses /etc/centos-release as an input file
-  echo "7|tests/r_pdf/*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "8|tests/r_pdf/*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "9|tests/r_pdf/*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
 fi
 # Most CentOS tests work for RHEL as well, with a few exceptions ...
-if [ "$DISTRO_NAME" == "Red Hat Enterprise Linux Server" ]; then
-  # random failures, ignoring
-  echo "7|tests/p_abrt/abrt_gpg_keys*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
-  echo "7|tests/p_anaconda/anaconda_centos_patch*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
-  echo "7|tests/p_httpd/*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
-  echo "7|tests/p_java-openjdk/*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
-  echo "7|tests/p_shim/01_shim_secureboot_signed*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
-  echo "7|tests/p_yum/yum_bugtracker*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
-  echo "7|tests/p_yum/yum_distroverpkg*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
-fi
 if [ "$DISTRO_NAME" == "Red Hat Enterprise Linux" ]; then
   echo "8|tests/p_lftp/10_lftp_http_test*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list
   echo "9|tests/p_lftp/10_lftp_http_test*|Not applicable on $DISTRO_NAME" >> ./skipped-tests.list