diff --git a/plans/smoke.fmf b/plans/basic.fmf
similarity index 72%
rename from plans/smoke.fmf
rename to plans/basic.fmf
index 0bd2f54f..1d3c88da 100644
--- a/plans/smoke.fmf
+++ b/plans/basic.fmf
@@ -1,5 +1,5 @@
 summary:
-    Basic smoke test
+    Check basic functionality
 discover:
     how: fmf
 provision:
diff --git a/tests/plugins/__init__.py b/tests/unit/__init__.py
similarity index 100%
rename from tests/plugins/__init__.py
rename to tests/unit/__init__.py
diff --git a/tests/unit/main.fmf b/tests/unit/main.fmf
new file mode 100644
index 00000000..0b28ad78
--- /dev/null
+++ b/tests/unit/main.fmf
@@ -0,0 +1,11 @@
+summary: Python unit tests
+description:
+    Run all available python unit tests using pytest.
+test: python3 -m pytest -vvv -ra --showlocals
+duration: 15m
+framework: shell
+require:
+  - python3-pytest
+environment:
+    LANG: en_US.UTF-8
+tier: 0
diff --git a/tests/plugins/disable_test_trac.py b/tests/unit/plugins/disable_test_trac.py
similarity index 100%
rename from tests/plugins/disable_test_trac.py
rename to tests/unit/plugins/disable_test_trac.py
diff --git a/tests/plugins/google-api-credentials.json b/tests/unit/plugins/google-api-credentials.json
similarity index 100%
rename from tests/plugins/google-api-credentials.json
rename to tests/unit/plugins/google-api-credentials.json
diff --git a/tests/plugins/test_bodhi.py b/tests/unit/plugins/test_bodhi.py
similarity index 100%
rename from tests/plugins/test_bodhi.py
rename to tests/unit/plugins/test_bodhi.py
diff --git a/tests/plugins/test_bugzilla.py b/tests/unit/plugins/test_bugzilla.py
similarity index 100%
rename from tests/plugins/test_bugzilla.py
rename to tests/unit/plugins/test_bugzilla.py
diff --git a/tests/plugins/test_gerrit.py b/tests/unit/plugins/test_gerrit.py
similarity index 100%
rename from tests/plugins/test_gerrit.py
rename to tests/unit/plugins/test_gerrit.py
diff --git a/tests/plugins/test_git.py b/tests/unit/plugins/test_git.py
similarity index 100%
rename from tests/plugins/test_git.py
rename to tests/unit/plugins/test_git.py
diff --git a/tests/plugins/test_github.py b/tests/unit/plugins/test_github.py
similarity index 100%
rename from tests/plugins/test_github.py
rename to tests/unit/plugins/test_github.py
diff --git a/tests/plugins/test_gitlab.py b/tests/unit/plugins/test_gitlab.py
similarity index 100%
rename from tests/plugins/test_gitlab.py
rename to tests/unit/plugins/test_gitlab.py
diff --git a/tests/plugins/test_google.py b/tests/unit/plugins/test_google.py
similarity index 100%
rename from tests/plugins/test_google.py
rename to tests/unit/plugins/test_google.py
diff --git a/tests/plugins/test_jira.py b/tests/unit/plugins/test_jira.py
similarity index 100%
rename from tests/plugins/test_jira.py
rename to tests/unit/plugins/test_jira.py
diff --git a/tests/plugins/test_pagure.py b/tests/unit/plugins/test_pagure.py
similarity index 100%
rename from tests/plugins/test_pagure.py
rename to tests/unit/plugins/test_pagure.py
diff --git a/tests/plugins/test_phabricator.py b/tests/unit/plugins/test_phabricator.py
similarity index 100%
rename from tests/plugins/test_phabricator.py
rename to tests/unit/plugins/test_phabricator.py
diff --git a/tests/plugins/test_redmine.py b/tests/unit/plugins/test_redmine.py
similarity index 100%
rename from tests/plugins/test_redmine.py
rename to tests/unit/plugins/test_redmine.py
diff --git a/tests/plugins/test_sentry.py b/tests/unit/plugins/test_sentry.py
similarity index 100%
rename from tests/plugins/test_sentry.py
rename to tests/unit/plugins/test_sentry.py
diff --git a/tests/plugins/test_trello.py b/tests/unit/plugins/test_trello.py
similarity index 100%
rename from tests/plugins/test_trello.py
rename to tests/unit/plugins/test_trello.py
diff --git a/tests/test_base.py b/tests/unit/test_base.py
similarity index 100%
rename from tests/test_base.py
rename to tests/unit/test_base.py
diff --git a/tests/test_cli.py b/tests/unit/test_cli.py
similarity index 96%
rename from tests/test_cli.py
rename to tests/unit/test_cli.py
index 109f0ad2..bc90c56a 100644
--- a/tests/test_cli.py
+++ b/tests/unit/test_cli.py
@@ -17,7 +17,7 @@
 # Prepare path and config examples
 PATH = os.path.dirname(os.path.realpath(__file__))
 MINIMAL = did.base.Config.example()
-EXAMPLE = "".join(open(PATH + "/../examples/config").readlines())
+EXAMPLE = "".join(open(PATH + "/../../examples/config").readlines())
 # Substitute example git paths for real life directories
 EXAMPLE = re.sub(r"\S+/git/[a-z]+", PATH, EXAMPLE)
 
diff --git a/tests/test_stats.py b/tests/unit/test_stats.py
similarity index 100%
rename from tests/test_stats.py
rename to tests/unit/test_stats.py
diff --git a/tests/test_utils.py b/tests/unit/test_utils.py
similarity index 100%
rename from tests/test_utils.py
rename to tests/unit/test_utils.py