diff --git a/last_commit.txt b/last_commit.txt
index bf9d59704f..adafe8a9a8 100644
--- a/last_commit.txt
+++ b/last_commit.txt
@@ -1,36 +1,38 @@
-Repository: plone.app.widgets
+Repository: plone.app.versioningbehavior
 
 
 Branch: refs/heads/master
-Date: 2025-01-20T21:17:17+01:00
+Date: 2025-01-20T21:11:44+01:00
 Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
-Commit: https://github.com/plone/plone.app.widgets/commit/6aba231762351e13ed7bd113c3e76fbfac16344e
+Commit: https://github.com/plone/plone.app.versioningbehavior/commit/c5557b96f9c3062c4e512083a932538293d135f1
 
 Fix DeprecationWarnings.
 
 Files changed:
 A news/4090.bugfix
-M docs/source/select_widget.rst
-M plone/app/widgets/testing.py
+M plone/app/versioningbehavior/testing.py
+M plone/app/versioningbehavior/tests/doctest_behavior.txt
+M plone/app/versioningbehavior/tests/test_functional.py
 
-b'diff --git a/docs/source/select_widget.rst b/docs/source/select_widget.rst\nindex dad6e52c..82bc1213 100644\n--- a/docs/source/select_widget.rst\n+++ b/docs/source/select_widget.rst\n@@ -82,6 +82,7 @@ uses this form:\n     from plone.app.testing.layers import FunctionalTesting\n     from plone.app.widgets.testing import PloneAppWidgetsLayer\n     from plone.app.widgets.testing import PLONEAPPWIDGETS_FIXTURE_DX\n+    from plone.testing import zope\n \n \n     class SelectWidgetLayer(PloneAppWidgetsLayer):\n@@ -99,7 +100,7 @@ uses this form:\n     SELECT_WIDGET_FIXTURE = SelectWidgetLayer()\n     SELECT_WIDGET_ROBOT_TESTING = FunctionalTesting(\n         bases=(SELECT_WIDGET_FIXTURE,\n-               z2.ZSERVER_FIXTURE),\n+               zope.WSGI_SERVER_FIXTURE),\n         name=\'SelectWidgetLayer:Robot\')\n \n .. note::\ndiff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 00000000..8528aefb\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/plone/app/widgets/testing.py b/plone/app/widgets/testing.py\nindex 52d57347..e3e637ea 100644\n--- a/plone/app/widgets/testing.py\n+++ b/plone/app/widgets/testing.py\n@@ -9,7 +9,7 @@\n from plone.app.z3cform.widget import SelectWidget\n from plone.autoform import directives\n from plone.autoform.form import AutoExtensibleForm\n-from plone.testing import z2\n+from plone.testing import zope\n from z3c.form import form\n from zope.configuration import xmlconfig\n from zope.interface import Interface\n@@ -108,7 +108,7 @@ def setUpZope(self, app, configurationContext):\n         except:\n             pass\n \n-        z2.installProduct(app, \'Products.DateRecurringIndex\')\n+        zope.installProduct(app, \'Products.DateRecurringIndex\')\n \n     def setUpPloneSite(self, portal):\n         super(PloneAppWidgetsDXLayer, self).setUpPloneSite(portal)\n@@ -128,7 +128,7 @@ def setUpPloneSite(self, portal):\n PLONEAPPWIDGETS_DX_ROBOT_TESTING = FunctionalTesting(\n     bases=(PLONEAPPWIDGETS_FIXTURE_DX,\n            REMOTE_LIBRARY_BUNDLE_FIXTURE,\n-           z2.ZSERVER_FIXTURE),\n+           zope.WSGI_SERVER_FIXTURE),\n     name="PloneAppWidgetsLayerDX:Robot")\n \n optionflags = (ELLIPSIS | NORMALIZE_WHITESPACE)\n'
+b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 0000000..8528aef\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/plone/app/versioningbehavior/testing.py b/plone/app/versioningbehavior/testing.py\nindex 0f84cd9..6aa73ca 100644\n--- a/plone/app/versioningbehavior/testing.py\n+++ b/plone/app/versioningbehavior/testing.py\n@@ -6,7 +6,7 @@\n from plone.app.testing import PloneSandboxLayer\n from plone.dexterity.fti import DexterityFTI\n from plone.protect import auto as protect_auto\n-from plone.testing import z2\n+from plone.testing import zope\n from Products.CMFCore.utils import getToolByName\n from Products.CMFDiffTool.TextDiff import TextDiff\n \n@@ -101,7 +101,7 @@ def testTearDown(self):\n     bases=(\n         PLONE_APP_VERSIONINGBEHAVIOR_FIXTURE,\n         REMOTE_LIBRARY_BUNDLE_FIXTURE,\n-        z2.ZSERVER_FIXTURE,\n+        zope.WSGI_SERVER_FIXTURE,\n     ),\n     name="PloneAppVersioningbehaviorLayer:AcceptanceTesting",\n )\ndiff --git a/plone/app/versioningbehavior/tests/doctest_behavior.txt b/plone/app/versioningbehavior/tests/doctest_behavior.txt\nindex cae4a1f..355e542 100644\n--- a/plone/app/versioningbehavior/tests/doctest_behavior.txt\n+++ b/plone/app/versioningbehavior/tests/doctest_behavior.txt\n@@ -3,7 +3,7 @@\n     >>> from plone.app.testing import TEST_USER_NAME\n     >>> from plone.app.testing import TEST_USER_PASSWORD\n     >>> from plone.app.testing import setRoles\n-    >>> from plone.testing.z2 import Browser\n+    >>> from plone.testing.zope import Browser\n     >>> import transaction\n \n     >>> portal = layer[\'portal\']\ndiff --git a/plone/app/versioningbehavior/tests/test_functional.py b/plone/app/versioningbehavior/tests/test_functional.py\nindex 438bc83..0cb1f1a 100644\n--- a/plone/app/versioningbehavior/tests/test_functional.py\n+++ b/plone/app/versioningbehavior/tests/test_functional.py\n@@ -6,7 +6,7 @@\n     PLONE_APP_VERSIONINGBEHAVIOR_FUNCTIONAL_TESTING,\n )\n from plone.app.versioningbehavior.testing import TEST_CONTENT_TYPE_ID\n-from plone.testing.z2 import Browser\n+from plone.testing.zope import Browser\n \n import transaction\n import unittest\n'
 
-Repository: plone.app.widgets
+Repository: plone.app.versioningbehavior
 
 
 Branch: refs/heads/master
-Date: 2025-01-21T15:45:28+01:00
+Date: 2025-01-21T15:46:32+01:00
 Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
-Commit: https://github.com/plone/plone.app.widgets/commit/92dcce6cbfa0dcfc1c81eaac5c994964c311e4d2
+Commit: https://github.com/plone/plone.app.versioningbehavior/commit/2339087e2c948000c9c5484f8a02bb4c80f24e0b
 
-Merge pull request #226 from plone/maurits-warnings
+Merge pull request #91 from plone/maurits-warnings
 
 Fix DeprecationWarnings.
 
 Files changed:
 A news/4090.bugfix
-M docs/source/select_widget.rst
-M plone/app/widgets/testing.py
+M plone/app/versioningbehavior/testing.py
+M plone/app/versioningbehavior/tests/doctest_behavior.txt
+M plone/app/versioningbehavior/tests/test_functional.py
 
-b'diff --git a/docs/source/select_widget.rst b/docs/source/select_widget.rst\nindex dad6e52c..82bc1213 100644\n--- a/docs/source/select_widget.rst\n+++ b/docs/source/select_widget.rst\n@@ -82,6 +82,7 @@ uses this form:\n     from plone.app.testing.layers import FunctionalTesting\n     from plone.app.widgets.testing import PloneAppWidgetsLayer\n     from plone.app.widgets.testing import PLONEAPPWIDGETS_FIXTURE_DX\n+    from plone.testing import zope\n \n \n     class SelectWidgetLayer(PloneAppWidgetsLayer):\n@@ -99,7 +100,7 @@ uses this form:\n     SELECT_WIDGET_FIXTURE = SelectWidgetLayer()\n     SELECT_WIDGET_ROBOT_TESTING = FunctionalTesting(\n         bases=(SELECT_WIDGET_FIXTURE,\n-               z2.ZSERVER_FIXTURE),\n+               zope.WSGI_SERVER_FIXTURE),\n         name=\'SelectWidgetLayer:Robot\')\n \n .. note::\ndiff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 00000000..8528aefb\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/plone/app/widgets/testing.py b/plone/app/widgets/testing.py\nindex 52d57347..e3e637ea 100644\n--- a/plone/app/widgets/testing.py\n+++ b/plone/app/widgets/testing.py\n@@ -9,7 +9,7 @@\n from plone.app.z3cform.widget import SelectWidget\n from plone.autoform import directives\n from plone.autoform.form import AutoExtensibleForm\n-from plone.testing import z2\n+from plone.testing import zope\n from z3c.form import form\n from zope.configuration import xmlconfig\n from zope.interface import Interface\n@@ -108,7 +108,7 @@ def setUpZope(self, app, configurationContext):\n         except:\n             pass\n \n-        z2.installProduct(app, \'Products.DateRecurringIndex\')\n+        zope.installProduct(app, \'Products.DateRecurringIndex\')\n \n     def setUpPloneSite(self, portal):\n         super(PloneAppWidgetsDXLayer, self).setUpPloneSite(portal)\n@@ -128,7 +128,7 @@ def setUpPloneSite(self, portal):\n PLONEAPPWIDGETS_DX_ROBOT_TESTING = FunctionalTesting(\n     bases=(PLONEAPPWIDGETS_FIXTURE_DX,\n            REMOTE_LIBRARY_BUNDLE_FIXTURE,\n-           z2.ZSERVER_FIXTURE),\n+           zope.WSGI_SERVER_FIXTURE),\n     name="PloneAppWidgetsLayerDX:Robot")\n \n optionflags = (ELLIPSIS | NORMALIZE_WHITESPACE)\n'
+b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 0000000..8528aef\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/plone/app/versioningbehavior/testing.py b/plone/app/versioningbehavior/testing.py\nindex 0f84cd9..6aa73ca 100644\n--- a/plone/app/versioningbehavior/testing.py\n+++ b/plone/app/versioningbehavior/testing.py\n@@ -6,7 +6,7 @@\n from plone.app.testing import PloneSandboxLayer\n from plone.dexterity.fti import DexterityFTI\n from plone.protect import auto as protect_auto\n-from plone.testing import z2\n+from plone.testing import zope\n from Products.CMFCore.utils import getToolByName\n from Products.CMFDiffTool.TextDiff import TextDiff\n \n@@ -101,7 +101,7 @@ def testTearDown(self):\n     bases=(\n         PLONE_APP_VERSIONINGBEHAVIOR_FIXTURE,\n         REMOTE_LIBRARY_BUNDLE_FIXTURE,\n-        z2.ZSERVER_FIXTURE,\n+        zope.WSGI_SERVER_FIXTURE,\n     ),\n     name="PloneAppVersioningbehaviorLayer:AcceptanceTesting",\n )\ndiff --git a/plone/app/versioningbehavior/tests/doctest_behavior.txt b/plone/app/versioningbehavior/tests/doctest_behavior.txt\nindex cae4a1f..355e542 100644\n--- a/plone/app/versioningbehavior/tests/doctest_behavior.txt\n+++ b/plone/app/versioningbehavior/tests/doctest_behavior.txt\n@@ -3,7 +3,7 @@\n     >>> from plone.app.testing import TEST_USER_NAME\n     >>> from plone.app.testing import TEST_USER_PASSWORD\n     >>> from plone.app.testing import setRoles\n-    >>> from plone.testing.z2 import Browser\n+    >>> from plone.testing.zope import Browser\n     >>> import transaction\n \n     >>> portal = layer[\'portal\']\ndiff --git a/plone/app/versioningbehavior/tests/test_functional.py b/plone/app/versioningbehavior/tests/test_functional.py\nindex 438bc83..0cb1f1a 100644\n--- a/plone/app/versioningbehavior/tests/test_functional.py\n+++ b/plone/app/versioningbehavior/tests/test_functional.py\n@@ -6,7 +6,7 @@\n     PLONE_APP_VERSIONINGBEHAVIOR_FUNCTIONAL_TESTING,\n )\n from plone.app.versioningbehavior.testing import TEST_CONTENT_TYPE_ID\n-from plone.testing.z2 import Browser\n+from plone.testing.zope import Browser\n \n import transaction\n import unittest\n'