diff --git a/setup.py b/setup.py
index 4ba997a0c..38e9eb017 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ PACKAGES = [
     'spacy.tests.spans',
     'spacy.tests.tagger',
     'spacy.tests.tokenizer',
-    'spacy.tests.tokens',
+    'spacy.tests.doc',
     'spacy.tests.vectors',
     'spacy.tests.vocab']
 
diff --git a/spacy/tests/tokens/__init__.py b/spacy/tests/doc/__init__.py
similarity index 100%
rename from spacy/tests/tokens/__init__.py
rename to spacy/tests/doc/__init__.py
diff --git a/spacy/tests/tokens/test_add_entities.py b/spacy/tests/doc/test_add_entities.py
similarity index 100%
rename from spacy/tests/tokens/test_add_entities.py
rename to spacy/tests/doc/test_add_entities.py
diff --git a/spacy/tests/tokens/test_array.py b/spacy/tests/doc/test_array.py
similarity index 100%
rename from spacy/tests/tokens/test_array.py
rename to spacy/tests/doc/test_array.py
diff --git a/spacy/tests/tokens/test_doc_api.py b/spacy/tests/doc/test_doc_api.py
similarity index 100%
rename from spacy/tests/tokens/test_doc_api.py
rename to spacy/tests/doc/test_doc_api.py
diff --git a/spacy/tests/tokens/test_noun_chunks.py b/spacy/tests/doc/test_noun_chunks.py
similarity index 100%
rename from spacy/tests/tokens/test_noun_chunks.py
rename to spacy/tests/doc/test_noun_chunks.py
diff --git a/spacy/tests/tokens/test_token_api.py b/spacy/tests/doc/test_token_api.py
similarity index 100%
rename from spacy/tests/tokens/test_token_api.py
rename to spacy/tests/doc/test_token_api.py