diff --git a/gating.yaml b/gating.yaml
index ce3cdc1..648918d 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,19 +1,6 @@
 --- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
---- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
---- !Policy
 product_versions:
   - rhel-9
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/plans/ci.fmf b/plans/ci.fmf
deleted file mode 100644
index 1ad2c12..0000000
--- a/plans/ci.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: CI Gating Plan
-discover:
-    how: fmf
-    directory: tests
-execute:
-    how: beakerlib
diff --git a/tests/Library/pcpcommon/Makefile b/tests/Library/pcpcommon/Makefile
deleted file mode 100644
index cb2c8a2..0000000
--- a/tests/Library/pcpcommon/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /CoreOS/pcp/Library/pcpcommon
-#   Description: Common functions for PCP tests
-#   Author: Milos Prchlik <mprchlik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/CoreOS/pcp/Library/pcpcommon
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) lib.sh Makefile runtest.sh
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Jan Kuřík <jkurik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     Common functions for PCP tests" >> $(METADATA)
-	@echo "Provides:        library(pcp/pcpcommon)" >> $(METADATA)
-	@echo "Type:            Library" >> $(METADATA)
-	@echo "TestTime:        15m" >> $(METADATA)
-	@echo "RunFor:          pcp" >> $(METADATA)
-	@echo "Requires:        pcp pcp-testsuite" >> $(METADATA)
-	@echo "Releases:        -RedHatEnterpriseLinux3 -RedHatEnterpriseLinux4 -RedHatEnterpriseLinuxClient5 -RedHatEnterpriseLinuxServer5" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-
-	rhts-lint $(METADATA)
diff --git a/tests/Library/pcpcommon/lib.sh b/tests/Library/pcpcommon/lib.sh
deleted file mode 100755
index 14ce5cc..0000000
--- a/tests/Library/pcpcommon/lib.sh
+++ /dev/null
@@ -1,390 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   lib.sh of /CoreOS/pcp/Library/pcpcommon
-#   Description: Common functions for PCP tests
-#   Author: Milos Prchlik <mprchlik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
-#
-#   This copyrighted material is made available to anyone wishing
-#   to use, modify, copy, or redistribute it subject to the terms
-#   and conditions of the GNU General Public License version 2.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  
-#   PURPOSE. See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public
-#   License along with this program; if not, write to the Free
-#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-#   Boston, MA 02110-1301, USA.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#   library-prefix = pcpcommon
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-. /usr/share/beakerlib/beakerlib.sh
-
-PACKAGES="pcp"
-
-pcpcommon_TESTDIR="$(pwd)"
-
-# Set all the usefull PCP variables
-pcpcommon_PCP_ENV="${pcpcommon_PCP_ENV:-/etc/pcp.env}"
-for i in $(. ${pcpcommon_PCP_ENV}; set | grep '^PCP_' | grep -v '\s'); do
-    eval pcpcommon_$i
-done
-
-pcpcommon_PCP_VAR_DIR=${pcpcommon_PCP_VAR_DIR:-/var/lib/pcp}
-pcpcommon_PCP_PMDAS_DIR=${pcpcommon_PCP_PMDAS_DIR:-${pcpcommon_PCP_VAR_DIR}/pmdas}
-pcpcommon_PCP_PMCDCONF_PATH=${pcpcommon_PCP_PMCDCONF_PATH:-/etc/pcp/pmcd/pmcd.conf}
-pcpcommon_PCP_LOG_DIR=${pcpcommon_PCP_LOG_DIR:-/var/log/pcp}
-pcpcommon_TESTSUITE_DIR=${pcpcommon_TESTSUITE_DIR:-${pcpcommon_PCP_VAR_DIR}/testsuite}
-pcpcommon_TESTSUITE_USER="${pcpcommon_TESTSUITE_USER:-pcpqa}"
-pcpcommon_TESTSUITE_USER_HOME=$(getent passwd ${pcpcommon_TESTSUITE_USER} \
-            | awk -F : '{print $6}')
-pcpcommon_TESTSUITE_USER_HOME="${pcpcommon_TESTSUITE_USER_HOME:-/home/${pcpcommon_TESTSUITE_USER}}"
-pcpcommon_REAL_TESTSUITE_USER="${pcpcommon_TESTSUITE_USER}"
-
-function map_metric() {
-    case "$1" in
-        dm)
-            echo dmcache
-            ;;
-        *)
-            echo $1
-            ;;
-    esac
-
-    return 0
-}
-
-function _pcpcommon_pmda_bpftrace_setup() {
-    rlFileBackup --namespace pcpcommon_pcpqa "${pcpcommon_PCP_PMDAS_DIR}/bpftrace"
-    if rlIsRHEL '>8.2'; then
-        rlRun "sed -i \
-            -e 's/^enabled =.*\$/enabled = true/g' \
-            -e 's/^auth_enabled =.*\$/auth_enabled = false/g' \
-            ${pcpcommon_PCP_PMDAS_DIR}/bpftrace/bpftrace.conf"
-    else
-        rlRun "sed -i \
-            -e 's/^enabled =.*\$/enabled = false/g' \
-            ${pcpcommon_PCP_PMDAS_DIR}/bpftrace/bpftrace.conf"
-    fi
-}
-
-pcpcommon_PCPQA_CREATED=
-pcpcommon_PCPQA_SETUP=
-function pcpcommon_testsuite_user() {
-    # Check if we have already setup the testsuite user or not
-    [[ -n "${pcpcommon_PCPQA_SETUP}" ]] && return 0
-    pcpcommon_PCPQA_SETUP="done"
-
-    rlFileBackup --clean --namespace pcpcommon_pcpqa --missing-ok \
-        "${pcpcommon_TESTSUITE_USER_HOME}"
-    if ! rlRun "id ${pcpcommon_TESTSUITE_USER}" 0,1; then
-        rlRun "useradd -d ${pcpcommon_TESTSUITE_USER_HOME} -m \
-            -s /bin/bash -U ${pcpcommon_TESTSUITE_USER}"
-        rlRun "chown -R ${pcpcommon_TESTSUITE_USER}:${pcpcommon_TESTSUITE_USER} \
-            ${pcpcommon_TESTSUITE_DIR}"
-        rlFail "User ${pcpcommon_TESTSUITE_USER} was not created by pcp packages" \
-            "- see BZ#1025688"
-        pcpcommon_PCPQA_CREATED="yes"
-    fi
-
-    # Fallback
-    if [[ ! -d ${pcpcommon_TESTSUITE_USER_HOME} ]]; then
-        rlRun "mkdir -p ${pcpcommon_TESTSUITE_USER_HOME}"
-    fi
-
-    # Make sure all the testsuite files are owned by pcpqa
-    rlRun "chown -R ${pcpcommon_TESTSUITE_USER}:${pcpcommon_TESTSUITE_USER} \
-        ${pcpcommon_TESTSUITE_DIR} ${pcpcommon_TESTSUITE_USER_HOME}"
-
-    # Configure sudo
-    if [[ -d "/etc/sudoers.d/" ]]; then
-        if [[ ! -f "/etc/sudoers.d/99_${pcpcommon_TESTSUITE_USER}" ]]; then
-            rlRun "rlFileBackup --clean --namespace pcpcommon_pcpqa --missing-ok \
-                /etc/sudoers.d/99_${pcpcommon_TESTSUITE_USER}"
-            rlRun "echo 'Defaults:${pcpcommon_TESTSUITE_USER} !requiretty' \
-                > /etc/sudoers.d/99_${pcpcommon_TESTSUITE_USER}"
-            rlRun "echo '${pcpcommon_TESTSUITE_USER} ALL=(ALL) NOPASSWD: ALL' \
-                >> /etc/sudoers.d/99_${pcpcommon_TESTSUITE_USER}"
-            rlRun "chmod 0440 /etc/sudoers.d/99_${pcpcommon_TESTSUITE_USER}"
-        fi
-    else
-        if ! grep -q "${pcpcommon_TESTSUITE_USER} ALL=(ALL) NOPASSWD: ALL" \
-            /etc/sudoers ; then
-            rlRun "rlFileBackup --namespace pcpcommon_pcpqa /etc/sudoers"
-            rlRun "echo 'Defaults:${pcpcommon_TESTSUITE_USER} !requiretty' \
-                >> /etc/sudoers"
-            rlRun "echo '${pcpcommon_TESTSUITE_USER} ALL=(ALL) NOPASSWD: ALL' \
-                >> /etc/sudoers"
-        fi
-    fi
-
-    # Setup ssh
-    rlRun "rlFileBackup --clean --namespace pcpcommon_pcpqa --missing-ok \
-        ${pcpcommon_TESTSUITE_USER_HOME}/.ssh"
-    if [[ ! -f "${pcpcommon_TESTSUITE_USER_HOME}/.ssh/id_rsa" ]]; then
-        rlRun "su - -c 'mkdir ${pcpcommon_TESTSUITE_USER_HOME}/.ssh' \
-            ${pcpcommon_TESTSUITE_USER}"
-        rlRun "su - -c 'ssh-keygen -t rsa -N \"\" \
-            -f ${pcpcommon_TESTSUITE_USER_HOME}/.ssh/id_rsa' ${pcpcommon_TESTSUITE_USER}"
-    fi
-    rlRun "su - -c 'cat ${pcpcommon_TESTSUITE_USER_HOME}/.ssh/id_rsa.pub \
-        >> ${pcpcommon_TESTSUITE_USER_HOME}/.ssh/authorized_keys' \
-        ${pcpcommon_TESTSUITE_USER}"
-    rlRun "echo 'Host *' >> ${pcpcommon_TESTSUITE_USER_HOME}/.ssh/config"
-    rlRun "echo 'StrictHostKeyChecking no' \
-        >> ${pcpcommon_TESTSUITE_USER_HOME}/.ssh/config"
-    rlRun "echo 'UserKnownHostsFile=/dev/null' \
-        >> ${pcpcommon_TESTSUITE_USER_HOME}/.ssh/config"
-    rlRun "chmod 600 ${pcpcommon_TESTSUITE_USER_HOME}/.ssh/config"
-    rlRun "chmod 0700 ${pcpcommon_TESTSUITE_USER_HOME}/.ssh"
-    rlRun "chmod 0640 ${pcpcommon_TESTSUITE_USER_HOME}/.ssh/authorized_keys"
-
-    # Setup default PATHs etc.
-    rlFileBackup --clean --namespace pcpcommon_pcpqa --missing-ok \
-        "${pcpcommon_TESTSUITE_USER_HOME}/.bashrc"
-    rlRun "su -s /bin/sh -c 'touch ${pcpcommon_TESTSUITE_USER_HOME}/.bashrc' \
-        ${pcpcommon_TESTSUITE_USER}"
-    rlRun "echo 'PATH=\${PATH}:\${PCP_BIN_DIR}:\${PCP_BINADM_DIR}:\${PCP_PLATFORM_PATHS}'\
-        >> ${pcpcommon_TESTSUITE_USER_HOME}/.bashrc"
-
-    return 0
-}
-
-function pcpcommon_testsuite_user_cleanup() {
-    # Check if we have anything to clenup
-    [[ -z "${pcpcommon_PCPQA_SETUP}" ]] && return 0
-    pcpcommon_PCPQA_SETUP=
-
-    # Kill everything related to pcpqa
-    rlRun "pkill --signal SIGTERM -u ${pcpcommon_TESTSUITE_USER}" 0-255
-    rlRun "pkill --signal SIGTERM -g ${pcpcommon_TESTSUITE_USER}" 0-255
-    rlRun "sleep 5" 0 "Wait a bit, so proceses can terminate gracefully"
-    rlRun "pkill --signal SIGKILL -u ${pcpcommon_TESTSUITE_USER}" 0-255
-    rlRun "pkill --signal SIGKILL -g ${pcpcommon_TESTSUITE_USER}" 0-255
-
-    if [[ -n "${pcpcommon_PCPQA_CREATED}" ]]; then
-        rlRun "userdel -f -r -Z ${pcpcommon_TESTSUITE_USER}" 0-255
-    fi
-    rlFileRestore --namespace pcpcommon_pcpqa
-
-    return 0
-}
-
-function pcpcommon_log_system_info() {
-    local pcpcommon_TMP=$(mktemp -d)
-    local pcpcommon_TAR=$(mktemp /tmp/XXXXXXXX.tar.gz)
-
-    rlShowRunningKernel
-    [[ -d /etc/os-release ]] && \
-        cp /etc/os-release ${pcpcommon_TMP}/os-release
-    env &> ${pcpcommon_TMP}/env
-    sestatus &> ${pcpcommon_TMP}/sestatus
-    [[ -d /var/run/pcp ]] && \
-        ls -alZ /var/run/pcp &> ${pcpcommon_TMP}/ls-alZ_var.run.pcp
-    pstree -u &> ${pcpcommon_TMP}/pstree
-    ps xau &> ${pcpcommon_TMP}/ps.aux
-    netstat -lpn &> ${pcpcommon_TMP}/netstat
-    ip addr &> ${pcpcommon_TMP}/ip.addr
-    hostname &> ${pcpcommon_TMP}/hostname
-    cp /etc/hosts ${pcpcommon_TMP}/etc.hosts
-    which iptables &> /dev/null && \
-        iptables -S &> ${pcpcommon_TMP}/iptables
-    which nft &> /dev/null && \
-        nft list ruleset &> ${pcpcommon_TMP}/nftables
-    
-    # Upload everything
-    tar czf ${pcpcommon_TAR} -C ${pcpcommon_TMP} $(cd ${pcpcommon_TMP} && ls -1)
-    rlFileSubmit "${pcpcommon_TAR}" "system.info.tar.gz"
-
-    # Cleanup
-    rm -rf ${pcpcommon_TMP} ${pcpcommon_TAR}
-
-    return 0
-}
-
-function pcpcommon_test () {
-    local ret=0
-    local params="$@"
-
-    pcpcommon_testsuite_user
-
-    if rlRun "pushd ${pcpcommon_TESTSUITE_DIR}"; then
-        rlRun -s "su -l -s /bin/bash -c 'cd ${pcpcommon_TESTSUITE_DIR} && \
-            ./check ${params}' ${pcpcommon_REAL_TESTSUITE_USER}"
-        rlFileSubmit "${rlRun_LOG}" "check.log"
-        local _test_results="${rlRun_LOG}"
-
-        if ! rlRun "egrep 'Passed all [[:digit:]]+ tests' ${_test_results}" 0 \
-            "Assert all testcases passed"; then
-            local _tmp_dir=$(mktemp -d)
-            local _tmp_tar=$(mktemp /tmp/XXXXXXXX.tar.gz)
-            local failid
-            local failids="$(egrep 'Failures: ' ${_test_results} | cut -d' ' -f2-)"
-
-            if [[ -n "${failids}" ]]; then
-                for failid in ${failids}; do
-                    rlFail "TC $failid failed"
-                    rlRun "cp ${failid}.out ${_tmp_dir}/"
-                    rlRun "cp ${failid}.out.bad ${_tmp_dir}/"
-                done
-                tar czf ${_tmp_tar} -C ${_tmp_dir} $(cd ${_tmp_dir} && ls -1)
-                rlFileSubmit "${_tmp_tar}" "failed.tests.tar.gz"
-            fi
-            rm -rf ${_tmp_tar} ${_tmp_dir}
-            ret=1
-        fi
-
-        if rlRun -s "egrep 'Not run: [[:digit:]]+' ${_test_results}" 0,1; then
-            rlLogWarning "$(cat ${rlRun_LOG})"
-        fi
-
-        rlRun "popd"
-    fi
-
-    return ${ret}
-}
-
-function pcpcommon_cleanup () {
-    # Cleanup everything related to pcpqa
-    pcpcommon_testsuite_user_cleanup
-    rlFileRestore --namespace pcpcommon_init 
-
-    return $?
-}
-
-function pcpcommon_pmda_install () {
-    local ret=1
-    local pmda="$1"
-    local retries=${2:-10}
-    local metrics
-
-    # Make sure the PMDA's RPM is installed
-    if ! rpm -q pcp-pmda-${pmda} &> /dev/null; then
-        rlRun "yum install -y pcp-pmda-${pmda}" || return 1
-    fi
-
-    # Check if the PMDA is already installed in PCP
-    rlRun -s "sed -e 's/^#.*\$//' -e '/^\\s*\$/d' -e '/^\\s*\\[.*\$/,\$ d' \
-        ${pcpcommon_PCP_PMCDCONF_PATH} | cut -f 1" 0 "Get the list of installed PMDAs"
-    if grep -w ${pmda} "${rlRun_LOG}"; then
-        rlLogInfo "${pmda} is already installed"
-        ret=0
-    else
-        if rlRun "pushd ${pcpcommon_PCP_PMDAS_DIR}/${pmda}"; then
-            [[ "${pmda}" == "bpftrace" ]] && _pcpcommon_pmda_bpftrace_setup
-            if rlRun "./Install < /dev/null"; then
-                ret=0
-
-                # Log all values the pmda is providing
-                rlRun -s "pminfo -f $(map_metric ${pmda})"
-		metrics="${rlRun_LOG}"
-		while [[ ${retries} -gt 0 ]]; do
-		    if grep -q 'Try again. Information not currently available' \
-                        "${metrics}"; then
-		        rlRun "sleep 10" 0 "Waiting for metrics to be available"
-                        rlRun -s "pminfo -f $(map_metric ${pmda})"
-		        metrics="${rlRun_LOG}"
-			rlLog "Number of retries left: $(( --retries ))"
-		    else
-                        retries=0
-		    fi
-		done
-                rlAssertNotGrep "Error: Resource temporarily unavailable" \
-		    "${metrics}" || ret=1
-                rlAssertNotGrep "Try again. Information not currently available" \
-		    "${metrics}" || ret=1
-                rlFileSubmit "${metrics}" "pmda.${pmda}.metrics.log"
-            fi
-            rlRun "popd"
-        else
-            rlFail "Unable to find PMDA's basedir ${pcpcommon_PCP_PMDAS_DIR}/${pmda}"
-        fi
-    fi
-
-    return ${ret}
-}
-
-function pcpcommon_pmda_remove () {
-    local ret=1
-    local pmda="$1"
-
-    if rlRun "pushd ${pcpcommon_PCP_PMDAS_DIR}/${pmda}" 0-255; then
-        rlRun "./Remove" 0-255 && ret=0
-        rlRun "popd"
-    else
-        rlLogInfo "Unable to find PMDA's basedir ${pcpcommon_PCP_PMDAS_DIR}/${pmda}"
-    fi
-
-    return ${ret}
-}
-
-function pcpcommon_pmda_check_log () {
-    local pmda="$1"
-    local errstr="fail|warn|error|crit|denied"
-    local logf="${pcpcommon_PCP_LOG_DIR}/pmcd/${pmda}.log"
-    local result=0
-
-    # Skip the log check if requested
-    case "${PCPCOMMON_PMDA_CHECK_LOG}" in
-        0|[Ff][Aa][Ll][Ss][Ee]|[Nn][Oo])
-            rlLogInfo "Skipping check of the ${pmda} log file"
-            return 0
-            ;;
-    esac
-
-    if [[ "${pmda}" == "nfsclient" ]]; then
-        rlRun -s "grep -v 'ignored, already in cache' ${logf}"
-        logf="${rlRun_LOG}"
-    fi
-
-    rlAssertNotGrep "${errstr}" ${logf} -Ei || result=1
-    rlFileSubmit "${logf}"
-
-    return ${result}
-}
-
-function pcpcommon_pmda_tests () {
-    local pmda="$1"
-    local addparam="$2"
-    local testgroup="pmda.${pmda}"
-
-    if rlRun "grep -q ${testgroup} ${pcpcommon_PCP_VAR_DIR}/testsuite/group" 0,1; then
-        pcpcommon_test "000 -g ${testgroup} ${addparam}"
-        pcpcommon_pmda_check_log ${pmda}
-    else
-        rlLogInfo "No upstream tests for ${pmda}"
-    fi
-}
-
-function pcpcommonLibraryLoaded () {
-    if ! rpm -q pcp-testsuite &>/dev/null; then
-        rlFail "pcp-testsuite RPM is not installed"
-        return 1
-    fi
-
-    rlFileBackup --namespace pcpcommon_init ${pcpcommon_PCP_ENV}
-
-    # RHEL-6 workaround
-    if ! ping -c 1 $(hostname) &> /dev/null; then
-        rlFileBackup --namespace pcpcommon_init /etc/hosts
-        echo 127.0.0.2 $(hostname) >> /etc/hosts
-    fi
-
-    # For PCP versions < '5.1.0' run the testuite as root
-    local _pcpver=$(rpm -q --qf '%{version}' pcp)
-    local _pcpcmp=$(rlCmpVersion "${_pcpver}" "5.2.0")
-    if [[ "${_pcpcmp}" == "<" ]];then
-        rlLogInfo "According to the PCP version, the testsuite will run as user: ${pcpcommon_REAL_TESTSUITE_USER}"
-        pcpcommon_REAL_TESTSUITE_USER="root"
-    fi
-
-    return 0
-}
diff --git a/tests/Library/pcpcommon/main.fmf b/tests/Library/pcpcommon/main.fmf
deleted file mode 100644
index be7d82b..0000000
--- a/tests/Library/pcpcommon/main.fmf
+++ /dev/null
@@ -1,13 +0,0 @@
-summary: Common functions for PCP tests
-contact:
-- Jan Kuřík <jkurik@redhat.com>
-component:
-- pcp
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- pcp
-- pcp-testsuite
-duration: 15m
-extra-summary: /CoreOS/pcp/Library/pcpcommon
-extra-task: /CoreOS/pcp/Library/pcpcommon
diff --git a/tests/Library/pcpcommon/runtest.sh b/tests/Library/pcpcommon/runtest.sh
deleted file mode 100755
index 8dd1d40..0000000
--- a/tests/Library/pcpcommon/runtest.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /CoreOS/pcp/Library/pcpcommon
-#   Description: Common functions for PCP tests
-#   Author: Jan Kuřík <jkurik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2020 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-. ../../Library/pcpcommon/lib.sh || exit 1
-
-PACKAGE="pcp"
-
-rlJournalStart
-    rlPhaseStartTest
-        rlRun "pcpcommonLibraryLoaded"
-
-        rlServiceStart pmcd
-        rlServiceStart pmlogger
-        rlServiceStart pmproxy
-        rlServiceStart pmie
-
-        err=0
-        pmda=bash
-        rlRun "pcpcommon_test -g sanity" || err=1
-        rlRun "pcpcommon_pmda_install ${pmda}" || err=1
-        rlRun "pcpcommon_pmda_tests ${pmda}" || err=1
-        rlRun "pcpcommon_pmda_remove ${pmda}" || err=1
-        rlRun "pcpcommon_cleanup"
-
-        [[ ${err} -ne 0 ]] && \
-            rlRun "pcpcommon_log_system_info"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/README b/tests/README
deleted file mode 100644
index 9ad59d4..0000000
--- a/tests/README
+++ /dev/null
@@ -1,2 +0,0 @@
-The test's Makefiles are not used in Fedora CI infrastructure.  But are kept here
-for backward compatibility with traditional beakerlib test harness in RHEL.
diff --git a/tests/Sanity/pcp-testsuite-sanity/Makefile b/tests/Sanity/pcp-testsuite-sanity/Makefile
deleted file mode 100644
index d1a9f85..0000000
--- a/tests/Sanity/pcp-testsuite-sanity/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Makefile of /tools/pcp/Sanity/pcp-testsuite-sanity
-#   Description: pcp testing by upstream testsuite
-#   Author: Jan Kuřík <jkurik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2018 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-export TEST=/tools/pcp/Sanity/pcp-testsuite-sanity
-export TESTVERSION=1.0
-
-BUILT_FILES=
-
-FILES=$(METADATA) runtest.sh Makefile PURPOSE bl
-
-.PHONY: all install download clean
-
-run: $(FILES) build
-	./runtest.sh
-
-build: $(BUILT_FILES)
-	test -x runtest.sh || chmod a+x runtest.sh
-
-clean:
-	rm -f *~ $(BUILT_FILES)
-
-
-include /usr/share/rhts/lib/rhts-make.include
-
-$(METADATA): Makefile
-	@echo "Owner:           Jan Kuřík <jkurik@redhat.com>" > $(METADATA)
-	@echo "Name:            $(TEST)" >> $(METADATA)
-	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
-	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
-	@echo "Description:     pcp testing by upstream testsuite" >> $(METADATA)
-	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        4h" >> $(METADATA)
-	@echo "RunFor:          pcp" >> $(METADATA)
-	@echo "Requires:        pcp time" >> $(METADATA)
-	@echo "Requires:        sudo procps-ng avahi bzip2 pcp-pmda-cisco" >> $(METADATA)
-	@echo "Requires:        coreutils pcp-pmda-news perl-PCP-LogImport" >> $(METADATA)
-	@echo "Requires:        perl-PCP-LogSummary python-pcp gcc" >> $(METADATA)
-	@echo "Requires:        redhat-rpm-config perl-PCP-LogSummary" >> $(METADATA)
-	@echo "Requires:        libuv libuv-devel" >> $(METADATA)
-	@echo "Requires:        /usr/bin/netstat pcp-testsuite" >> $(METADATA)
-	#@echo "Requires:        library(pcp/pcpcommon)" >> $(METADATA)
-	@echo "Priority:        Normal" >> $(METADATA)
-	@echo "License:         GPLv2+" >> $(METADATA)
-	@echo "Confidential:    no" >> $(METADATA)
-	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
-	@echo "Bug:             1760750" >> $(METADATA)
-	#@echo "RhtsRequires:    library(pcp/pcpcommon)" >> $(METADATA)
-
-	rhts-lint $(METADATA)
diff --git a/tests/Sanity/pcp-testsuite-sanity/PURPOSE b/tests/Sanity/pcp-testsuite-sanity/PURPOSE
deleted file mode 100644
index 29ee86a..0000000
--- a/tests/Sanity/pcp-testsuite-sanity/PURPOSE
+++ /dev/null
@@ -1,3 +0,0 @@
-PURPOSE of /tools/pcp/Sanity/pcp-testsuite-sanity
-Description: pcp testing by upstream testsuite
-Author: Jan Kuřík <jkurik@redhat.com>
diff --git a/tests/Sanity/pcp-testsuite-sanity/bl/s390x b/tests/Sanity/pcp-testsuite-sanity/bl/s390x
deleted file mode 100644
index 290db00..0000000
--- a/tests/Sanity/pcp-testsuite-sanity/bl/s390x
+++ /dev/null
@@ -1,2 +0,0 @@
-034
-178
diff --git a/tests/Sanity/pcp-testsuite-sanity/main.fmf b/tests/Sanity/pcp-testsuite-sanity/main.fmf
deleted file mode 100644
index 6adf5ed..0000000
--- a/tests/Sanity/pcp-testsuite-sanity/main.fmf
+++ /dev/null
@@ -1,31 +0,0 @@
-summary: pcp testing by upstream testsuite
-description: ''
-contact:
-- Jan Kuřík <jkurik@redhat.com>
-component:
-- pcp
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- pcp
-- time
-- sudo
-- procps-ng
-- avahi
-- bzip2
-- pcp-pmda-cisco
-- coreutils
-- pcp-pmda-news
-- perl-PCP-LogImport
-- perl-PCP-LogSummary
-- python-pcp
-- gcc
-- redhat-rpm-config
-- perl-PCP-LogSummary
-- libuv
-- libuv-devel
-- /usr/bin/netstat
-- pcp-testsuite
-duration: 4h
-extra-summary: /tools/pcp/Sanity/pcp-testsuite-sanity
-extra-task: /tools/pcp/Sanity/pcp-testsuite-sanity
diff --git a/tests/Sanity/pcp-testsuite-sanity/runtest.sh b/tests/Sanity/pcp-testsuite-sanity/runtest.sh
deleted file mode 100755
index 0a07f08..0000000
--- a/tests/Sanity/pcp-testsuite-sanity/runtest.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/pcp/Sanity/pcp-testsuite-sanity
-#   Description: pcp testing by upstream testsuite
-#   Author: Jan Kuřík <jkurik@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2018 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-. ../../Library/pcpcommon/lib.sh || exit 1
-
-PACKAGE="pcp"
-TSUSER="pcpqa"
-TCWD="$(pwd)"
-
-export SYSTEMD_PAGER=''
-
-function apply_bl() {
-    local bl="${1}"
-    local tc
-
-    if [[ ! -r "${bl}" ]] ; then
-        rlLogDebug "No BL $(basename ${bl}) found"
-        return
-    fi
-    rlLog "Applying BL $(basename ${bl})"
-    while read tc; do
-        rlRun "sed -i '/^${tc} /d' /var/lib/pcp/testsuite/group"
-    done < "${bl}"
-
-    return
-}
-
-rlJournalStart
-  rlPhaseStartSetup
-    rlShowRunningKernel
-    rlAssertRpm "${PACKAGE}"
-    rlFileBackup --clean --missing-ok /etc/pcp /etc/pcp.conf /etc/pcp.env \
-        /etc/sysconfig/pmcd /etc/sysconfig/pmie_timers /etc/sysconfig/pmlogger \
-        /etc/sysconfig/pmlogger_timers /etc/sysconfig/pmproxy /var/lib/pcp/config 
-    rlRun "TmpDir=\$(mktemp -d)"
-    rlRun "pcpcommonLibraryLoaded"
-  rlPhaseEnd
-
-  rlPhaseStartSetup "PCP restart"
-    rlRun "rlServiceStart pmcd pmlogger" 0-255
-    rlRun "rlServiceEnable pmcd pmlogger" 0-255
-    rlRun "sleep 30" 0 "Give services some time to fully start"
-  rlPhaseEnd
-
-  rlPhaseStartSetup "BL listing"
-    # Get all the variables we need
-    read ID VERSION_ID < <(
-        . /etc/os-release && \
-            echo ${ID} ${VERSION_ID} || \
-            echo rhel 6.10
-    )
-    IFS='.,-_ ' read MAJOR MINOR MICRO <<< "${VERSION_ID}"
-    ARCH=$(arch)
-
-    _BLSEQ="${ID} ${ID}-${MAJOR}"
-    [[ -n "${MINOR}" ]] && _BLSEQ="${BLSEQ} ${ID}-${MAJOR}.${MINOR}"
-    [[ -n "${MICRO}" ]] && _BLSEQ="${BLSEQ} ${ID}-${MAJOR}.${MINOR}.${MICRO}"
-
-    IFS='.,-_ ' read MAJOR MINOR MICRO < <(rpm -q --qf '%{version}' ${PACKAGE})
-    _BLSEQ="${BLSEQ} ${PACKAGE}"
-    [[ -n "${MAJOR}" ]] && _BLSEQ="${BLSEQ} ${PACKAGE}-${MAJOR}"
-    [[ -n "${MINOR}" ]] && _BLSEQ="${BLSEQ} ${PACKAGE}-${MAJOR}.${MINOR}"
-    [[ -n "${MICRO}" ]] && _BLSEQ="${BLSEQ} ${PACKAGE}-${MAJOR}.${MINOR}.${MICRO}"
-
-    BLSEQ=
-    for bl in ${_BLSEQ}; do
-        BLSEQ="${BLSEQ} ${bl} ${bl}.${ARCH}"
-    done
-
-    for bl in ${BLSEQ}; do
-        rlLog "Looking for BL list ${bl}"
-        if [[ -r "${TCWD}/bl/${bl}" ]]; then
-            apply_bl "${TCWD}/bl/${bl}"
-        fi
-    done
-  rlPhaseEnd
-
-  rlPhaseStartTest "run testsuite"
-    rlRun "pcpcommon_test -g sanity" || rlRun "pcpcommon_log_system_info"
-  rlPhaseEnd
-
-  rlPhaseStartCleanup
-    rlRun "pcpcommon_cleanup"
-    rlRun "rlServiceRestore" 0-255
-    rlRun "rm -r $TmpDir"
-    rlFileRestore
-  rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd