diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..ce3cdc1
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,19 @@
+--- !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}
diff --git a/plans/ci.fmf b/plans/ci.fmf
new file mode 100644
index 0000000..1ad2c12
--- /dev/null
+++ b/plans/ci.fmf
@@ -0,0 +1,6 @@
+summary: CI Gating Plan
+discover:
+    how: fmf
+    directory: tests
+execute:
+    how: beakerlib
diff --git a/tests/README b/tests/README
new file mode 100644
index 0000000..9ad59d4
--- /dev/null
+++ b/tests/README
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000..d1a9f85
--- /dev/null
+++ b/tests/Sanity/pcp-testsuite-sanity/Makefile
@@ -0,0 +1,72 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   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
new file mode 100644
index 0000000..29ee86a
--- /dev/null
+++ b/tests/Sanity/pcp-testsuite-sanity/PURPOSE
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..290db00
--- /dev/null
+++ b/tests/Sanity/pcp-testsuite-sanity/bl/s390x
@@ -0,0 +1,2 @@
+034
+178
diff --git a/tests/Sanity/pcp-testsuite-sanity/main.fmf b/tests/Sanity/pcp-testsuite-sanity/main.fmf
new file mode 100644
index 0000000..6adf5ed
--- /dev/null
+++ b/tests/Sanity/pcp-testsuite-sanity/main.fmf
@@ -0,0 +1,31 @@
+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
new file mode 100755
index 0000000..9b9522f
--- /dev/null
+++ b/tests/Sanity/pcp-testsuite-sanity/runtest.sh
@@ -0,0 +1,115 @@
+#!/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
+
+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 "yum install -y --enablerepo=\* 'library(pcp/pcpcommon)'" 0-255
+    rlRun "rlImport pcp/pcpcommon"
+  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