diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/plans/ci.fmf b/plans/ci.fmf
deleted file mode 100644
index c1627f9..0000000
--- a/plans/ci.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-summary: Basic smoke test
-discover:
-    how: fmf
-execute:
-    how: tmt
diff --git a/tests/test-of-functionality-of-crontabs/main.fmf b/tests/test-of-functionality-of-crontabs/main.fmf
deleted file mode 100644
index 30aff61..0000000
--- a/tests/test-of-functionality-of-crontabs/main.fmf
+++ /dev/null
@@ -1,12 +0,0 @@
-summary: test of functionality of crontabs
-description: ''
-contact: Petr Sklenar <psklenar@redhat.com>
-component:
-  - crontabs
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-  - crontabs
-duration: 30m
-extra-summary: /CoreOS/crontabs/Sanity/test-of-functionality-of-crontabs
-extra-task: /CoreOS/crontabs/Sanity/test-of-functionality-of-crontabs
diff --git a/tests/test-of-functionality-of-crontabs/runtest.sh b/tests/test-of-functionality-of-crontabs/runtest.sh
old mode 100755
new mode 100644
index 0090593..98548b2
--- a/tests/test-of-functionality-of-crontabs/runtest.sh
+++ b/tests/test-of-functionality-of-crontabs/runtest.sh
@@ -27,7 +27,8 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include rhts environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
+. /usr/bin/rhts-environment.sh
+. /usr/lib/beakerlib/beakerlib.sh
 
 PACKAGE="crontabs"
 #how long should we wait:
@@ -38,7 +39,6 @@ rlJournalStart
 	user="petr$RANDOM"
         rlRun "rm -rf /tmp/test.createdbypetr /tmp/test.createdbyroot" 0 "Removing tmp directory"
 	rlRun "useradd $user"
-	rlRun "rlServiceStart crond"
 	rlFileBackup /etc/crontab
     rlPhaseEnd
 
@@ -76,8 +76,7 @@ rlJournalStart
 
     rlPhaseStartCleanup
         rlRun "rm -rf /tmp/test.createdbypetr /tmp/test.createdbyroot" 0 "Removing tmp directory"
-	rlRun "userdel -rf $user"
-	rlRun "rlServiceRestore crond"
+	rlRun "userdel -r $user"
 	rlFileRestore
     rlPhaseEnd
 rlJournalPrintText
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..22f9d4d
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,12 @@
+---
+# This first play always runs on the local staging system
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    tests:
+    - test-of-functionality-of-crontabs
+    required_packages:
+    - crontabs          # test-of-functionality-of-crontabs needs crontabs
+    - findutils         # beakerlib needs find command