diff --git a/.zuul.d/python-jobs.yaml b/.zuul.d/python-jobs.yaml
index 216471f7be..2bbcfd0666 100644
--- a/.zuul.d/python-jobs.yaml
+++ b/.zuul.d/python-jobs.yaml
@@ -87,6 +87,16 @@
     vars:
       tox_env: py38
 
+- job:
+    name: rally-tox-samples
+    parent: rally-tox-base
+    description: |
+      Run unit test for rally project.
+
+      Uses tox with the ``samples`` environment.
+    vars:
+      tox_env: samples
+
 - job:
     name: rally-tox-cover
     parent: tox-cover
diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
index aeb2f03ce6..26646c167d 100644
--- a/.zuul.d/zuul.yaml
+++ b/.zuul.d/zuul.yaml
@@ -88,6 +88,7 @@
         - rally-tox-py36
         - rally-tox-py37
         - rally-tox-py38
+        - rally-tox-samples
         - rally-tox-functional
         - rally-tox-functional-py38
         - rally-tox-self
diff --git a/tests/samples/test_task_samples.py b/tests/samples/test_task_samples.py
index 7b76a06609..75d63275e2 100644
--- a/tests/samples/test_task_samples.py
+++ b/tests/samples/test_task_samples.py
@@ -17,8 +17,8 @@ import inspect
 import itertools
 import os
 import traceback
+from unittest import mock
 
-import mock
 import yaml
 
 import rally
@@ -37,10 +37,7 @@ class TaskSampleTestCase(test.TestCase):
 
     def setUp(self):
         super(TaskSampleTestCase, self).setUp()
-        if os.environ.get("TOX_ENV_NAME") == "cover":
-            self.skipTest("There is no need to check samples in coverage job.")
-        with mock.patch("rally.api.API.check_db_revision"):
-            self.rapi = api.API()
+        self.rapi = api.API(skip_db_check=True)
 
     def iterate_samples(self, merge_pairs=True):
         """Iterates all task samples
diff --git a/tox.ini b/tox.ini
index 8e69eaeddb..0b9d0f6e75 100644
--- a/tox.ini
+++ b/tox.ini
@@ -40,6 +40,12 @@ basepython = python3.7
 [testenv:py38]
 basepython = python3.8
 
+[testenv:samples]
+commands =
+  find . -type f -name "*.pyc" -delete
+  python {toxinidir}/tests/ci/pytest_launcher.py tests/samples --posargs={posargs}
+
+
 [testenv:venv]
 commands = {posargs}