diff --git a/spacy/tests/de/tokenizer/test_exceptions.py b/spacy/tests/de/test_exceptions.py
similarity index 100%
rename from spacy/tests/de/tokenizer/test_exceptions.py
rename to spacy/tests/de/test_exceptions.py
diff --git a/spacy/tests/de/tokenizer/test_prefix_suffix_infix.py b/spacy/tests/de/test_prefix_suffix_infix.py
similarity index 100%
rename from spacy/tests/de/tokenizer/test_prefix_suffix_infix.py
rename to spacy/tests/de/test_prefix_suffix_infix.py
diff --git a/spacy/tests/de/tokenizer/test_text.py b/spacy/tests/de/test_text.py
similarity index 100%
rename from spacy/tests/de/tokenizer/test_text.py
rename to spacy/tests/de/test_text.py
diff --git a/spacy/tests/de/tokenizer/__init__.py b/spacy/tests/de/tokenizer/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/spacy/tests/en/tokenizer/test_contractions.py b/spacy/tests/en/test_contractions.py
similarity index 100%
rename from spacy/tests/en/tokenizer/test_contractions.py
rename to spacy/tests/en/test_contractions.py
diff --git a/spacy/tests/en/tokenizer/test_exceptions.py b/spacy/tests/en/test_exceptions.py
similarity index 100%
rename from spacy/tests/en/tokenizer/test_exceptions.py
rename to spacy/tests/en/test_exceptions.py
diff --git a/spacy/tests/en/tokenizer/test_indices.py b/spacy/tests/en/test_indices.py
similarity index 100%
rename from spacy/tests/en/tokenizer/test_indices.py
rename to spacy/tests/en/test_indices.py
diff --git a/spacy/tests/en/tokenizer/test_prefix_suffix_infix.py b/spacy/tests/en/test_prefix_suffix_infix.py
similarity index 100%
rename from spacy/tests/en/tokenizer/test_prefix_suffix_infix.py
rename to spacy/tests/en/test_prefix_suffix_infix.py
diff --git a/spacy/tests/en/tokenizer/test_punct.py b/spacy/tests/en/test_punct.py
similarity index 97%
rename from spacy/tests/en/tokenizer/test_punct.py
rename to spacy/tests/en/test_punct.py
index b6ae9224d..e58db1e2b 100644
--- a/spacy/tests/en/tokenizer/test_punct.py
+++ b/spacy/tests/en/test_punct.py
@@ -6,8 +6,8 @@ from __future__ import unicode_literals
 
 import pytest
 
-from ....util import compile_prefix_regex
-from ....language_data import TOKENIZER_PREFIXES
+from ...util import compile_prefix_regex
+from ...language_data import TOKENIZER_PREFIXES
 
 
 
diff --git a/spacy/tests/en/tokenizer/test_text.py b/spacy/tests/en/test_text.py
similarity index 100%
rename from spacy/tests/en/tokenizer/test_text.py
rename to spacy/tests/en/test_text.py
diff --git a/spacy/tests/en/tokenizer/__init__.py b/spacy/tests/en/tokenizer/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/spacy/tests/hu/tokenizer/test_tokenizer.py b/spacy/tests/hu/test_tokenizer.py
similarity index 100%
rename from spacy/tests/hu/tokenizer/test_tokenizer.py
rename to spacy/tests/hu/test_tokenizer.py
diff --git a/spacy/tests/hu/tokenizer/__init__.py b/spacy/tests/hu/tokenizer/__init__.py
deleted file mode 100644
index e69de29bb..000000000