diff --git a/MANIFEST.in b/MANIFEST.in
index 7979ec080930d6111125664d1785feee69045d76..8243a942ee9c9d512f68e769d040fa8b360573c5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,6 +2,7 @@ include synctl
 include LICENSE
 include VERSION
 include *.rst
+include demo/README
 
 recursive-include synapse/storage/schema *.sql
 
diff --git a/setup.cfg b/setup.cfg
index 2830831f00748a2995b571c2ead12779b5c4e9dd..888ad6ed4a0ffab657235e132de84a7c3b9034b1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,3 +8,11 @@ test = trial
 
 [trial]
 test_suite = tests
+
+[check-manifest]
+ignore =
+    contrib
+    contrib/*
+    docs/*
+    pylint.cfg
+    tox.ini
diff --git a/tests/storage/TESTS_NEEDED_FOR b/tests/storage/TESTS_NEEDED_FOR
deleted file mode 100644
index 8e5d0cbdc4fd88a672a7b26a9308dc658cd072a0..0000000000000000000000000000000000000000
--- a/tests/storage/TESTS_NEEDED_FOR
+++ /dev/null
@@ -1,5 +0,0 @@
-synapse/storage/feedback.py
-synapse/storage/keys.py
-synapse/storage/pdu.py
-synapse/storage/stream.py
-synapse/storage/transactions.py