diff --git a/news/44.breaking.4 b/news/44.breaking.4
new file mode 100644
index 0000000..a012eb7
--- /dev/null
+++ b/news/44.breaking.4
@@ -0,0 +1,4 @@
+Removed ``tests`` extra, kept only ``test`` extra and ``storage``.
+Swapped packages slightly between those two extras.
+For ``storage`` we depend on ``persistent`` and ``ZODB``.
+[maurits]
diff --git a/setup.py b/setup.py
index c018102..3f24087 100644
--- a/setup.py
+++ b/setup.py
@@ -7,14 +7,18 @@
 changes = open("CHANGES.rst").read()
 
 STORAGE_REQUIREMENTS = [
+    "ZODB",
     "zope.annotation",
-    "zope.component",
-    "zope.configuration",
     "zope.interface",
-    "Persistence",
+    "persistent",
 ]
 
-TESTS_REQUIREMENTS = ["plone.testing"]
+# "zope.configuration",
+TEST_REQUIREMENTS = [
+    "zope.component",
+    "zope.configuration",
+    "plone.testing",
+]
 
 setup(
     name="plone.scale",
@@ -54,8 +58,7 @@
         "setuptools",
     ],
     extras_require=dict(
-        test=TESTS_REQUIREMENTS,
         storage=STORAGE_REQUIREMENTS,
-        tests=STORAGE_REQUIREMENTS + TESTS_REQUIREMENTS,
+        test=STORAGE_REQUIREMENTS + TEST_REQUIREMENTS,
     ),
 )