diff --git a/README b/README
new file mode 100644
index 0000000..9900b89
--- /dev/null
+++ b/README
@@ -0,0 +1 @@
+Repository for ghostscript CI tests
diff --git a/Sanity/opvp-driver-from-ArtifexSoftware/main.fmf b/Sanity/opvp-driver-from-ArtifexSoftware/main.fmf
index 97e3426..ddd53ae 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#0617552
-id: 8e6dd1f0-0166-4f4f-afb0-cd3296992f57
+extra-nitrate: TC#0617559
+id: 9f202f36-9b8d-4637-ad70-15ad32994191
diff --git a/Sanity/opvp-driver-from-ArtifexSoftware/test.sh b/Sanity/opvp-driver-from-ArtifexSoftware/test.sh
index 72405e9..75fed91 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"
+    rlPhaseStartTest "Test the driver"
         [ -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 202ffdc..6215946 100644
--- a/Smoke/start-stop-all-binaries/main.fmf
+++ b/Smoke/start-stop-all-binaries/main.fmf
@@ -11,7 +11,6 @@ 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 054f491..67e519e 100755
--- a/Smoke/start-stop-all-binaries/runtest.sh
+++ b/Smoke/start-stop-all-binaries/runtest.sh
@@ -77,14 +77,9 @@ for i in "ghostscript" "gs" "gsnd" "ps2ascii";do
 done
 
 rlPhaseStartTest 'pdf2dsc'
-	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
+	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"
 rlPhaseEnd
 
 rlPhaseStartTest 'pdf2ps'
diff --git a/main.fmf b/main.fmf
index e8554d7..41e2fab 100644
--- a/main.fmf
+++ b/main.fmf
@@ -1,4 +1,2 @@
 # QE owner
 contact: Petr Sklenar <psklenar@redhat.com>
-check:
-  - how: avc
diff --git a/plans/all.fmf b/plans/all.fmf
deleted file mode 100644
index e1a0780..0000000
--- a/plans/all.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-summary: Run all tests
-discover:
-    how: fmf
-execute:
-    how: tmt
diff --git a/plans/ci.fmf b/plans/ci.fmf
new file mode 100644
index 0000000..239d93d
--- /dev/null
+++ b/plans/ci.fmf
@@ -0,0 +1,6 @@
+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
deleted file mode 100644
index f4d6e73..0000000
--- a/plans/others.fmf
+++ /dev/null
@@ -1,20 +0,0 @@
-/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
deleted file mode 100644
index 51ff418..0000000
--- a/plans/tier1.fmf
+++ /dev/null
@@ -1,20 +0,0 @@
-/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
deleted file mode 100644
index 99ab577..0000000
--- a/plans/tier2-tier3.fmf
+++ /dev/null
@@ -1,20 +0,0 @@
-/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