diff --git a/setup.py b/setup.py
index c51ef8c44..0a6dd8082 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,6 @@ PACKAGES = [
     'spacy.munge',
     'spacy.tests',
     'spacy.tests.matcher',
-    'spacy.tests.morphology',
     'spacy.tests.munge',
     'spacy.tests.parser',
     'spacy.tests.serialize',
diff --git a/spacy/tests/morphology/test_morphology_pickle.py b/spacy/tests/morphology/test_morphology_pickle.py
deleted file mode 100644
index d98539d95..000000000
--- a/spacy/tests/morphology/test_morphology_pickle.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import pytest
-
-import pickle
-import io
-
-
-from spacy.morphology import Morphology
-from spacy.lemmatizer import Lemmatizer
-from spacy.strings import StringStore
-
-@pytest.mark.xfail
-def test_pickle():
-    morphology = Morphology(StringStore(), {}, Lemmatizer({}, {}, {})) 
-
-    file_ = io.BytesIO()
-    pickle.dump(morphology, file_)
-
diff --git a/spacy/tests/test_matcher.py b/spacy/tests/test_matcher.py
index 903328981..86701bbca 100644
--- a/spacy/tests/test_matcher.py
+++ b/spacy/tests/test_matcher.py
@@ -92,22 +92,3 @@ def test_phrase_matcher():
     matcher = PhraseMatcher(vocab, [Doc(vocab, words='Google Now'.split())])
     doc = Doc(vocab, words=['I', 'like', 'Google', 'Now', 'best'])
     assert len(matcher(doc)) == 1
-
-
-#@pytest.mark.models
-#def test_match_preserved(EN):
-#    patterns = {
-#        'JS': ['PRODUCT', {}, [[{'ORTH': 'JavaScript'}]]],
-#        'GoogleNow':  ['PRODUCT', {}, [[{'ORTH': 'Google'}, {'ORTH': 'Now'}]]],
-#        'Java':       ['PRODUCT', {}, [[{'LOWER': 'java'}]]],
-#    }
-#    matcher = Matcher(EN.vocab, patterns)
-#    doc = EN.tokenizer('I like java.')
-#    EN.tagger(doc)
-#    assert len(doc.ents) == 0
-#    doc = EN.tokenizer('I like java.')
-#    doc.ents += tuple(matcher(doc))
-#    assert len(doc.ents) == 1
-#    EN.tagger(doc)
-#    EN.entity(doc)
-#    assert len(doc.ents) == 1
diff --git a/spacy/tests/vocab/conftest.py b/spacy/tests/vocab/conftest.py
deleted file mode 100644
index b28358463..000000000
--- a/spacy/tests/vocab/conftest.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import pytest
-
-
-@pytest.fixture(scope="session")
-def en_vocab(EN):
-    return EN.vocab