diff --git a/elastic_recheck/tests/functional/__init__.py b/elastic_recheck/tests/functional/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/elastic_recheck/tests/test_classifier.py b/elastic_recheck/tests/functional/test_classifier.py
similarity index 100%
rename from elastic_recheck/tests/test_classifier.py
rename to elastic_recheck/tests/functional/test_classifier.py
diff --git a/elastic_recheck/tests/test_gerrit_comment.py b/elastic_recheck/tests/functional/test_gerrit_comment.py
similarity index 100%
rename from elastic_recheck/tests/test_gerrit_comment.py
rename to elastic_recheck/tests/functional/test_gerrit_comment.py
diff --git a/elastic_recheck/tests/test_queries.py b/elastic_recheck/tests/functional/test_queries.py
similarity index 100%
rename from elastic_recheck/tests/test_queries.py
rename to elastic_recheck/tests/functional/test_queries.py
diff --git a/elastic_recheck/tests/unit/__init__.py b/elastic_recheck/tests/unit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/elastic_recheck/tests/test_required_files.py b/elastic_recheck/tests/unit/test_required_files.py
similarity index 100%
rename from elastic_recheck/tests/test_required_files.py
rename to elastic_recheck/tests/unit/test_required_files.py
diff --git a/tox.ini b/tox.ini
index 287fc475..e73f083d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py26,py27,py33,pypy,pep8
+envlist = py26,py27,py33,pypy,pep8,functional
 skipsdist = True
 
 [testenv]
@@ -13,7 +13,10 @@ setenv =
    LC_ALL=C
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = python setup.py testr --slowest --testr-args='{posargs} tests.unit'
+
+[testenv:functional]
+commands = python setup.py testr --slowest --testr-args='{posargs} tests.functional'
 
 [testenv:pep8]
 commands = flake8