diff --git a/tests/simple-test/runtest.sh b/tests/simple-test/runtest.sh
deleted file mode 100644
index 90fa844..0000000
--- a/tests/simple-test/runtest.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Include Beaker environment
-. /usr/bin/rhts-environment.sh
-. /usr/lib/beakerlib/beakerlib.sh
-
-PACKAGE="python3-gear"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "python3 -c 'import gear'"
-    rlPhaseEnd
-
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/simple-test/runtest.yml b/tests/simple-test/runtest.yml
deleted file mode 100644
index f02be80..0000000
--- a/tests/simple-test/runtest.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- hosts: '{{ hosts | default("localhost") }}'
-  vars:
-    package: python3-gear
-  tasks:
-    - name: Check if package exists
-      command: "rpm -q {{ package }}"
-      args:
-        warn: no
-    - name: Runtest
-      shell: "python3 -c 'import gear'"
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 014be7f..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    - atomic
-    tests:
-    - simple-test
-    required_packages:
-    - python3-gear
diff --git a/tests_renamed/simple-test/runtest.sh b/tests_renamed/simple-test/runtest.sh
new file mode 100644
index 0000000..90fa844
--- /dev/null
+++ b/tests_renamed/simple-test/runtest.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Include Beaker environment
+. /usr/bin/rhts-environment.sh
+. /usr/lib/beakerlib/beakerlib.sh
+
+PACKAGE="python3-gear"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlRun "python3 -c 'import gear'"
+    rlPhaseEnd
+
+rlJournalPrintText
+rlJournalEnd
diff --git a/tests_renamed/simple-test/runtest.yml b/tests_renamed/simple-test/runtest.yml
new file mode 100644
index 0000000..f02be80
--- /dev/null
+++ b/tests_renamed/simple-test/runtest.yml
@@ -0,0 +1,10 @@
+- hosts: '{{ hosts | default("localhost") }}'
+  vars:
+    package: python3-gear
+  tasks:
+    - name: Check if package exists
+      command: "rpm -q {{ package }}"
+      args:
+        warn: no
+    - name: Runtest
+      shell: "python3 -c 'import gear'"
diff --git a/tests_renamed/tests.yml b/tests_renamed/tests.yml
new file mode 100644
index 0000000..014be7f
--- /dev/null
+++ b/tests_renamed/tests.yml
@@ -0,0 +1,11 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    - atomic
+    tests:
+    - simple-test
+    required_packages:
+    - python3-gear