diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..9a9fbea
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1,13 @@
+/test:
+    summary:
+        CI plan, picks Tier1 tests, runs in beakerlib.
+    description:
+        This special plan has to be named ci.fmf to run in CI.
+        It selects test which have 'tier 1' in their main.fmf file
+    discover:
+      - name: tier1
+        how: fmf
+        filter: 'tier: 1'
+        repository: "https://src.fedoraproject.org/tests/bind.git"
+    execute:
+        how: tmt
diff --git a/tests/tests.yml b/tests/tests.yml
index 15360ed..f30faff 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -6,21 +6,6 @@
     tags:
     - classic
     tests:
-    - Master-server-chrooted
-    - Master-server-not-chrooted
-    - Run-internal-BIND-test-suite
-    required_packages:
-    - bind
-    - bind-chroot
-    - bind-sdb-chroot
-    - redhat-lsb
-    - bind-utils
-    - dnf-utils
-    - kyua
-    - bind-devel
-    - perl-Net-DNS
-    - perl-Net-DNS-Nameserver
-    - perl-Time-HiRes
-    - softhsm
-    - bind-pkcs11
-    - bind-pkcs11-utils
+    - repo: "https://src.fedoraproject.org/tests/bind.git"
+      dest: "bind-tests"
+      fmf_filter: "tier: 1"