diff --git a/src/documents/index.py b/src/documents/index.py
index a6c3abba8..ffa3e688f 100644
--- a/src/documents/index.py
+++ b/src/documents/index.py
@@ -64,9 +64,6 @@ def get_schema():
 
 
 def open_index(recreate=False):
-    # TODO: this is not thread safe. If 2 instances try to create the index
-    #  at the same time, this fails. This currently prevents parallel
-    #  tests.
     try:
         if exists_in(settings.INDEX_DIR) and not recreate:
             return open_dir(settings.INDEX_DIR)
diff --git a/src/setup.cfg b/src/setup.cfg
index f43c9adf6..2a1a348bd 100644
--- a/src/setup.cfg
+++ b/src/setup.cfg
@@ -3,7 +3,7 @@ exclude = migrations, paperless/settings.py, .tox, */tests/*
 
 [tool:pytest]
 DJANGO_SETTINGS_MODULE=paperless.settings
-addopts = --pythonwarnings=all --cov --cov-report=html
+addopts = --pythonwarnings=all --cov --cov-report=html -n auto
 env =
   PAPERLESS_DISABLE_DBHANDLER=true