diff --git a/changelog.d/11322.misc b/changelog.d/11322.misc
new file mode 100644
index 000000000000..86594a332db9
--- /dev/null
+++ b/changelog.d/11322.misc
@@ -0,0 +1 @@
+Add type hints to storage classes.
diff --git a/mypy.ini b/mypy.ini
index f0af4ab28955..60672ea5c87a 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -177,16 +177,7 @@ disallow_untyped_defs = True
 [mypy-synapse.state.*]
 disallow_untyped_defs = True
 
-[mypy-synapse.storage.databases.main.client_ips]
-disallow_untyped_defs = True
-
-[mypy-synapse.storage.databases.main.room_batch]
-disallow_untyped_defs = True
-
-[mypy-synapse.storage.databases.main.user_erasure_store]
-disallow_untyped_defs = True
-
-[mypy-synapse.storage.util.*]
+[mypy-synapse.storage]
 disallow_untyped_defs = True
 
 [mypy-synapse.streams.*]
@@ -279,10 +270,7 @@ disallow_untyped_defs = True
 [mypy-synapse.util.versionstring]
 disallow_untyped_defs = True
 
-[mypy-tests.handlers.test_user_directory]
-disallow_untyped_defs = True
-
-[mypy-tests.storage.test_user_directory]
+[mypy-tests]
 disallow_untyped_defs = True
 
 ;; Dependencies without annotations