diff --git a/tox.ini b/tox.ini
index 984cbd7..3aeb0d3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py27
+envlist = units, linters
 skip_missing_interpreters = True
 
 [testenv]
@@ -33,8 +33,8 @@ deps=
 commands = python -m unittest tests.test_cicd_apps.MuranoCiCdTest.test_deploy_cicd
 
 [testenv:units]
-# FIXME!
-commands = python -m unittest unittests.test_namespaces.TestNamespaces.test_namespaces
+commands =
+  python -m unittest discover unittests --pattern=*.py
 
 [testenv:bindep]
 # Do not install any requirements. We want this to be fast and work even if
@@ -71,4 +71,3 @@ whitelist_externals = shellcheck
 commands =
    {toxinidir}/tools/jenkins/shellcheck.sh {toxinidir}
    {toxinidir}/tools/jenkins/yamllint.sh {toxinidir}
-