diff --git a/README b/README
deleted file mode 100644
index 9900b89..0000000
--- a/README
+++ /dev/null
@@ -1 +0,0 @@
-Repository for ghostscript CI tests
diff --git a/Sanity/opvp-driver-from-ArtifexSoftware/main.fmf b/Sanity/opvp-driver-from-ArtifexSoftware/main.fmf
index ddd53ae..97e3426 100644
--- a/Sanity/opvp-driver-from-ArtifexSoftware/main.fmf
+++ b/Sanity/opvp-driver-from-ArtifexSoftware/main.fmf
@@ -10,5 +10,5 @@ require:
   - gcc
 duration: 35m
 tier: '2'
-extra-nitrate: TC#0617559
-id: 9f202f36-9b8d-4637-ad70-15ad32994191
+extra-nitrate: TC#0617552
+id: 8e6dd1f0-0166-4f4f-afb0-cd3296992f57
diff --git a/Sanity/opvp-driver-from-ArtifexSoftware/test.sh b/Sanity/opvp-driver-from-ArtifexSoftware/test.sh
index 75fed91..72405e9 100755
--- a/Sanity/opvp-driver-from-ArtifexSoftware/test.sh
+++ b/Sanity/opvp-driver-from-ArtifexSoftware/test.sh
@@ -10,7 +10,7 @@ rlJournalStart
         rlRun "set -o pipefail"
     rlPhaseEnd
 
-    rlPhaseStartTest "Test the driver"
+    rlPhaseStartTest "Test"
         [ -d ghostpdl ] || rlRun "git clone https://github.com/psklenar/ghostpdl.git"
         rlRun "pushd ghostpdl/contrib/opvp/"
         rlRun "./build_opv_harness.sh"
diff --git a/Smoke/start-stop-all-binaries/main.fmf b/Smoke/start-stop-all-binaries/main.fmf
index 6215946..202ffdc 100644
--- a/Smoke/start-stop-all-binaries/main.fmf
+++ b/Smoke/start-stop-all-binaries/main.fmf
@@ -11,6 +11,7 @@ test: ./runtest.sh
 framework: beakerlib
 recommend:
   - ghostscript
+  - file
 duration: 10m
 enabled: true
 tag:
diff --git a/Smoke/start-stop-all-binaries/runtest.sh b/Smoke/start-stop-all-binaries/runtest.sh
index 67e519e..054f491 100755
--- a/Smoke/start-stop-all-binaries/runtest.sh
+++ b/Smoke/start-stop-all-binaries/runtest.sh
@@ -77,9 +77,14 @@ for i in "ghostscript" "gs" "gsnd" "ps2ascii";do
 done
 
 rlPhaseStartTest 'pdf2dsc'
-	rlRun "pdf2dsc IBM-RED-HAT-Press-Release-10-2018.pdf  &> $LOG"
-	rlRun "cff $LOG"
-	rlRun "file IBM-RED-HAT-Press-Release-10-2018.dsc|grep DSC"
+	if rlIsRHELLike '>10'
+	then
+		rlLog "pdf2dsc is not maintained upstream, skipping"
+	else
+		rlRun "pdf2dsc IBM-RED-HAT-Press-Release-10-2018.pdf  &> $LOG"
+		rlRun "cff $LOG"
+		rlRun "file IBM-RED-HAT-Press-Release-10-2018.dsc|grep DSC"
+	fi
 rlPhaseEnd
 
 rlPhaseStartTest 'pdf2ps'
diff --git a/main.fmf b/main.fmf
index 41e2fab..e8554d7 100644
--- a/main.fmf
+++ b/main.fmf
@@ -1,2 +1,4 @@
 # QE owner
 contact: Petr Sklenar <psklenar@redhat.com>
+check:
+  - how: avc
diff --git a/plans/all.fmf b/plans/all.fmf
new file mode 100644
index 0000000..e1a0780
--- /dev/null
+++ b/plans/all.fmf
@@ -0,0 +1,5 @@
+summary: Run all tests
+discover:
+    how: fmf
+execute:
+    how: tmt
diff --git a/plans/ci.fmf b/plans/ci.fmf
deleted file mode 100644
index 239d93d..0000000
--- a/plans/ci.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: CI plan, picks up all tests, runs in beakerlib.
-discover:
-  - name: fedora
-    how: fmf
-execute:
-    how: tmt
diff --git a/plans/others.fmf b/plans/others.fmf
new file mode 100644
index 0000000..f4d6e73
--- /dev/null
+++ b/plans/others.fmf
@@ -0,0 +1,20 @@
+/public:
+  summary: Public other tests
+  discover:
+    how: fmf
+    filter: 'tier: -1 & tier: -2 & tier: -3 & tag: -multihost'
+    url: "https://src.fedoraproject.org/tests/ghostscript.git"
+  execute:
+    how: tmt
+
+/internal:
+  summary: Internal other tests
+  discover:
+    how: fmf
+    filter: 'tier: -1 & tier: -2 & tier: -3 & tag: -multihost'
+    url: https://gitlab.com/redhat/rhel/tests/ghostscript
+  adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora
+  execute:
+    how: tmt
diff --git a/plans/tier1.fmf b/plans/tier1.fmf
new file mode 100644
index 0000000..51ff418
--- /dev/null
+++ b/plans/tier1.fmf
@@ -0,0 +1,20 @@
+/public:
+  summary: Public Tier1 tests
+  discover:
+    how: fmf
+    filter: 'tier: 1'
+    url: "https://src.fedoraproject.org/tests/ghostscript.git"
+  execute:
+    how: tmt
+
+/internal:
+  summary: Internal Tier1 tests
+  discover:
+    how: fmf
+    filter: 'tier: 1'
+    url: https://gitlab.com/redhat/rhel/tests/ghostscript
+  adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora
+  execute:
+    how: tmt
diff --git a/plans/tier2-tier3.fmf b/plans/tier2-tier3.fmf
new file mode 100644
index 0000000..99ab577
--- /dev/null
+++ b/plans/tier2-tier3.fmf
@@ -0,0 +1,20 @@
+/public:
+  summary: Public Tier2 and Tier3 tests
+  discover:
+    how: fmf
+    filter: 'tier: 2 | tier: 3'
+    url: "https://src.fedoraproject.org/tests/ghostscript.git"
+  execute:
+    how: tmt
+
+/internal:
+  summary: Internal Tier2 and Tier3 tests
+  discover:
+    how: fmf
+    filter: 'tier: 2 | tier: 3'
+    url: https://gitlab.com/redhat/rhel/tests/ghostscript
+  adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora
+  execute:
+    how: tmt