diff --git a/plans/ci.fmf b/plans/ci.fmf
new file mode 100644
index 0000000..c1627f9
--- /dev/null
+++ b/plans/ci.fmf
@@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+    how: fmf
+execute:
+    how: tmt
diff --git a/tests/at b/tests/at
deleted file mode 160000
index 30cccc8..0000000
--- a/tests/at
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 30cccc88a2064eb05018a09d65164a26972cd5b5
diff --git a/tests/initscript/main.fmf b/tests/initscript/main.fmf
new file mode 100644
index 0000000..275b067
--- /dev/null
+++ b/tests/initscript/main.fmf
@@ -0,0 +1,12 @@
+summary: Initscript sanity
+description: ''
+contact: Radek Biba <rbiba@redhat.com>
+component:
+  - at
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - at
+duration: 5m
+extra-summary: /CoreOS/at/Sanity/initscript
+extra-task: /CoreOS/at/Sanity/initscript
diff --git a/tests/initscript/runtest.sh b/tests/initscript/runtest.sh
index a84aecb..67ecc2d 100755
--- a/tests/initscript/runtest.sh
+++ b/tests/initscript/runtest.sh
@@ -27,7 +27,7 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include rhts environment
-. /usr/share/rhts-library/rhtslib.sh
+. /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="at"
 SERVICE="atd"
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 751a586..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# This first play always runs on the local staging system
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    - container
-    - atomic
-    tests:
-    - initscript
-    required_packages:
-    - at       # Required to run initscript