diff --git a/Dockerfile b/Dockerfile
index 6d46c6dee..5a8d54fb8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -157,13 +157,14 @@ RUN if [ "$RUN_TESTS" = true ]; then \
       venv/bin/pip install -r requirements-tests.txt ;\
     fi
 
+
 RUN if [ "$RUN_TESTS" = true ]; then \
-      TEST=true PYTHONPATH="." venv/bin/py.test --timeout=3600 --verbose \
+      TEST=true PYTHONPATH="." venv/bin/py.test --timeout=7200 --verbose \
                 --show-count -x --color=no ./; \
     fi
 
 RUN if [ "$RUN_TESTS" = true ]; then \
-      TEST=true PYTHONPATH="." venv/bin/py.test  --timeout=3600 --verbose \
+      TEST=true PYTHONPATH="." venv/bin/py.test  --timeout=7200 --verbose \
                 --show-count -x --color=no test/registry_tests.py ; \
     fi
 
diff --git a/setup.cfg b/setup.cfg
index fe664afff..636bdd178 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,7 @@
 [tool:pytest]
-norecursedirs = .* *.egg build dist docs
+norecursedirs = .* *.egg build dist docs bin boot core dev etc home lib lib64 media mnt node_modules opt proc root run sbin srv sys tmp usr var venv
 testpaths = ./
+python_files = **/test/*.py test/**.py
 
 [coverage:run]
 branch = True