diff --git a/Makefile b/Makefile
index 896a9c5..cd54e7a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,14 @@
+DOCKER_IMAGE=ruby
+
 default: test
 
-build:
-	docker build -t ruby .
-	docker run -d ruby
+build-docker:
+	docker build -t $(DOCKER_IMAGE) . 
+
+test-nspawn:
+	MODULE=nspawn $(MAKE) -C tests test
+
+test-docker: build-docker
+	MODULE=docker URL=docker=$(DOCKER_IMAGE) $(MAKE) -C tests test
 
-test:
-	$(MAKE) -C tests $@
+test: test-nspawn test-docker
diff --git a/tests/Makefile b/tests/Makefile
index 6595113..6683583 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,14 +1,6 @@
-# A workflow with modularity-testing-framework is still uncertain.
-# Only nspawn is actually used.
-# https://meta-test-family.readthedocs.io/en/latest/index.html
-#
 # Installation
-# $ sudo dnf install modularity-testing-framework python2-avocado
-# $ sudo /usr/bin/pip install behave
+# https://meta-test-family.readthedocs.io/en/latest/installation.html#installing-mtf
 test:
+	mtf-env-set
 	mtf-generator
-	MODULE=nspawn \
-	python -d -m avocado run \
-		--filter-by-tags=-WIP \
-		/usr/share/moduleframework/tools/modulelint.py \
-		*.py
+	mtf -l *.py
diff --git a/tests/config.yaml b/tests/config.yaml
index ec3708c..491e3bf 100644
--- a/tests/config.yaml
+++ b/tests/config.yaml
@@ -2,10 +2,14 @@ document: modularity-testing
 version: 1
 name: ruby
 modulemd-url: https://src.fedoraproject.org/cgit/modules/ruby.git/plain/ruby.yaml
+packages:
+    rpms:
+        - ruby
 module:
     rpm:
-        repos:
-            - http://mirror.vutbr.cz/fedora/releases/26/Everything/x86_64/os/
+        url: http://ftp.fi.muni.cz/pub/linux/fedora/linux/releases/26/Everything/x86_64/os/
+    docker:
+        url: docker.io/centos/ruby-23-centos7
 test:
     version:
         - 'ruby -v'