diff --git a/.gitignore b/.gitignore
index c2956c7..6a222e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.py[oc]
+tests/generated.py
diff --git a/tests/Makefile b/tests/Makefile
index df28881..6060723 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -4,5 +4,4 @@ CMD=python -m avocado run --filter-by-tags=-WIP $(MODULE_LINT) *.py
 
 #
 all:
-	generator
 	$(CMD)
diff --git a/tests/config.yaml b/tests/config.yaml
index 2632cd0..5bf624d 100644
--- a/tests/config.yaml
+++ b/tests/config.yaml
@@ -8,23 +8,14 @@ packages:
     rpms:
         # add which here because of the issue.
         # https://pagure.io/modularity-testing-framework/issue/45
+        - which
         - ruby
 testdependecies:
     rpms:
         - which
 module:
     docker:
-        start: "docker run -it"
         container: docker.io/ruby
     rpm:
         repos:
-            - http://download.eng.brq.redhat.com/pub/fedora/linux/development/rawhide/Everything/x86_64/os/
-            - http://download.eng.brq.redhat.com/pub/fedora/linux/development/26/Everything/x86_64/os/
-test:
-    cmd:
-        - 'which ruby'
-    version:
-        - 'ruby -v'
-testhost:
-    hostname:
-        - 'hostname'
+            - http://mirror.vutbr.cz/fedora/releases/25/Everything/x86_64/os/
diff --git a/tests/generated.py b/tests/ruby_tests.py
similarity index 80%
rename from tests/generated.py
rename to tests/ruby_tests.py
index 3d31f62..ce9bbd5 100644
--- a/tests/generated.py
+++ b/tests/ruby_tests.py
@@ -4,10 +4,7 @@ import socket
 from avocado import main
 from moduleframework import module_framework
 
-if __name__ == '__main__':
-    main()
-
-class GeneratedTestsConfig(module_framework.AvocadoTest):
+class RubyTests(module_framework.AvocadoTest):
     """
     :avocado: enable
     """
@@ -22,4 +19,8 @@ class GeneratedTestsConfig(module_framework.AvocadoTest):
 
     def test_hostname(self):
         self.start()
-        self.runHost("hostname")
+        self.run("hostname")
+
+
+if __name__ == '__main__':
+    main()