diff --git a/news/4090.bugfix b/news/4090.bugfix
new file mode 100644
index 0000000..8528aef
--- /dev/null
+++ b/news/4090.bugfix
@@ -0,0 +1 @@
+Fix DeprecationWarnings. [maurits]
diff --git a/plone/app/users/browser/account.py b/plone/app/users/browser/account.py
index b9aa9fd..05ccc76 100644
--- a/plone/app/users/browser/account.py
+++ b/plone/app/users/browser/account.py
@@ -2,12 +2,12 @@
 from Acquisition import aq_inner
 from PIL import Image
 from PIL import UnidentifiedImageError
-from plone.app.layout.navigation.interfaces import INavigationRoot
 from plone.app.users.browser.interfaces import IAccountPanelForm
 from plone.app.users.browser.schemaeditor import getFromBaseSchema
 from plone.app.users.utils import notifyWidgetActionExecutionError
 from plone.autoform.form import AutoExtensibleForm
 from plone.base import PloneMessageFactory as _
+from plone.base.interfaces import INavigationRoot
 from plone.base.interfaces import IPloneSiteRoot
 from plone.base.interfaces import ISecuritySchema
 from plone.base.utils import safe_text
diff --git a/plone/app/users/browser/configure.zcml b/plone/app/users/browser/configure.zcml
index 63d6592..2e8677d 100644
--- a/plone/app/users/browser/configure.zcml
+++ b/plone/app/users/browser/configure.zcml
@@ -13,14 +13,14 @@
 
   <browser:page
       name="register"
-      for="plone.app.layout.navigation.interfaces.INavigationRoot"
+      for="plone.base.interfaces.INavigationRoot"
       class=".register.RegistrationForm"
       permission="cmf.AddPortalMember"
       />
 
   <browser:page
       name="registered"
-      for="plone.app.layout.navigation.interfaces.INavigationRoot"
+      for="plone.base.interfaces.INavigationRoot"
       class=".registered.RegisteredView"
       template="registered.pt"
       permission="cmf.AddPortalMember"
@@ -28,42 +28,42 @@
 
   <browser:page
       name="new-user"
-      for="plone.app.layout.navigation.interfaces.INavigationRoot"
+      for="plone.base.interfaces.INavigationRoot"
       class=".register.AddUserForm"
       permission="plone.app.controlpanel.UsersAndGroups"
       />
 
   <browser:page
       name="change-password"
-      for="plone.app.layout.navigation.interfaces.INavigationRoot"
+      for="plone.base.interfaces.INavigationRoot"
       class=".passwordpanel.PasswordPanel"
       permission="cmf.SetOwnPassword"
       />
 
   <browser:page
       name="personal-preferences"
-      for="plone.app.layout.navigation.interfaces.INavigationRoot"
+      for="plone.base.interfaces.INavigationRoot"
       class=".personalpreferences.PersonalPreferencesPanel"
       permission="cmf.SetOwnProperties"
       />
 
   <browser:page
       name="user-preferences"
-      for="plone.app.layout.navigation.interfaces.INavigationRoot"
+      for="plone.base.interfaces.INavigationRoot"
       class=".personalpreferences.PersonalPreferencesConfiglet"
       permission="plone.app.controlpanel.UsersAndGroups"
       />
 
   <browser:page
       name="personal-information"
-      for="plone.app.layout.navigation.interfaces.INavigationRoot"
+      for="plone.base.interfaces.INavigationRoot"
       class=".userdatapanel.UserDataPanel"
       permission="cmf.SetOwnProperties"
       />
 
   <browser:page
       name="user-information"
-      for="plone.app.layout.navigation.interfaces.INavigationRoot"
+      for="plone.base.interfaces.INavigationRoot"
       class=".userdatapanel.UserDataConfiglet"
       permission="plone.app.controlpanel.UsersAndGroups"
       />
@@ -93,13 +93,13 @@
   <adapter
       factory=".personalpreferences.PersonalPreferencesPanelAdapter"
       provides=".personalpreferences.IPersonalPreferences"
-      for="plone.app.layout.navigation.interfaces.INavigationRoot"
+      for="plone.base.interfaces.INavigationRoot"
       />
 
   <adapter
       factory=".passwordpanel.PasswordPanelAdapter"
       provides=".passwordpanel.IPasswordSchema"
-      for="plone.app.layout.navigation.interfaces.INavigationRoot"
+      for="plone.base.interfaces.INavigationRoot"
       />
 
   <subscriber
diff --git a/plone/app/users/testing.py b/plone/app/users/testing.py
index b97c87c..f702af2 100644
--- a/plone/app/users/testing.py
+++ b/plone/app/users/testing.py
@@ -4,7 +4,7 @@
 from plone.app.testing import FunctionalTesting
 from plone.app.testing import IntegrationTesting
 from plone.app.testing import PloneSandboxLayer
-from plone.testing import z2
+from plone.testing import zope
 
 import plone.app.users
 
@@ -41,7 +41,7 @@ def setUpPloneSite(self, portal):
     bases=(
         PLONE_APP_USERS_FIXTURE,
         REMOTE_LIBRARY_BUNDLE_FIXTURE,
-        z2.ZSERVER_FIXTURE,
+        zope.WSGI_SERVER_FIXTURE,
     ),
     name="PloneAppUsersLayer:AcceptanceTesting",
 )
diff --git a/plone/app/users/tests/base.py b/plone/app/users/tests/base.py
index 60924f4..45e9bc0 100644
--- a/plone/app/users/tests/base.py
+++ b/plone/app/users/tests/base.py
@@ -14,7 +14,7 @@
 from plone.base.interfaces import IMailSchema
 from plone.base.interfaces import ISecuritySchema
 from plone.registry.interfaces import IRegistry
-from plone.testing.z2 import Browser
+from plone.testing.zope import Browser
 from Products.CMFPlone.tests.utils import MockMailHost
 from Products.MailHost.interfaces import IMailHost
 from Products.PlonePAS.setuphandlers import activatePluginInterfaces
diff --git a/plone/app/users/tests/duplicate_email.rst b/plone/app/users/tests/duplicate_email.rst
index 2f29718..6656c9d 100644
--- a/plone/app/users/tests/duplicate_email.rst
+++ b/plone/app/users/tests/duplicate_email.rst
@@ -28,7 +28,7 @@ Create a new user two:
 
 Login as user two:
 
-    >>> from plone.testing.z2 import Browser
+    >>> from plone.testing.zope import Browser
     >>> browser = Browser(layer['app'])
     >>> browser.open('http://nohost/plone/')
     >>> browser.getLink('Log in').click()
diff --git a/plone/app/users/tests/email_login.rst b/plone/app/users/tests/email_login.rst
index 70d314d..2d6d97b 100644
--- a/plone/app/users/tests/email_login.rst
+++ b/plone/app/users/tests/email_login.rst
@@ -8,7 +8,7 @@ Set up
     >>> from plone.app.testing import SITE_OWNER_NAME
     >>> from plone.app.testing import SITE_OWNER_PASSWORD
     >>> from plone.app.testing import TEST_USER_PASSWORD
-    >>> from plone.testing.z2 import Browser
+    >>> from plone.testing.zope import Browser
 
     >>> app = layer['app']
     >>> portal = layer['portal']
diff --git a/plone/app/users/tests/flexible_user_registration.rst b/plone/app/users/tests/flexible_user_registration.rst
index a3fae15..e533195 100644
--- a/plone/app/users/tests/flexible_user_registration.rst
+++ b/plone/app/users/tests/flexible_user_registration.rst
@@ -2,7 +2,7 @@
 Testing the flexible user registration
 ======================================
 
-    >>> from plone.testing.z2 import Browser
+    >>> from plone.testing.zope import Browser
     >>> from plone.app.testing import SITE_OWNER_PASSWORD
     >>> import transaction
     >>> app = layer['app']
diff --git a/plone/app/users/tests/forms_navigationroot.rst b/plone/app/users/tests/forms_navigationroot.rst
index 35de379..3038a52 100644
--- a/plone/app/users/tests/forms_navigationroot.rst
+++ b/plone/app/users/tests/forms_navigationroot.rst
@@ -9,10 +9,10 @@ Set up
 ======
 
     >>> from Products.Five.utilities.marker import mark
-    >>> from plone.app.layout.navigation.interfaces import INavigationRoot
+    >>> from plone.base.interfaces import INavigationRoot
     >>> from plone.app.testing import SITE_OWNER_NAME
     >>> from plone.app.testing import SITE_OWNER_PASSWORD
-    >>> from plone.testing.z2 import Browser
+    >>> from plone.testing.zope import Browser
 
     >>> app = layer['app']
     >>> portal = layer['portal']
diff --git a/plone/app/users/tests/member_search.rst b/plone/app/users/tests/member_search.rst
index eeb4743..92a21d0 100644
--- a/plone/app/users/tests/member_search.rst
+++ b/plone/app/users/tests/member_search.rst
@@ -12,7 +12,7 @@ Set up
     >>> from plone.app.testing import SITE_OWNER_PASSWORD
     >>> from plone.app.testing import TEST_USER_NAME
     >>> from plone.app.testing import TEST_USER_PASSWORD
-    >>> from plone.testing.z2 import Browser
+    >>> from plone.testing.zope import Browser
 
     >>> app = layer['app']
     >>> portal = layer['portal']
diff --git a/plone/app/users/tests/password.rst b/plone/app/users/tests/password.rst
index 510983e..8224669 100644
--- a/plone/app/users/tests/password.rst
+++ b/plone/app/users/tests/password.rst
@@ -9,7 +9,7 @@ Set up
 
     >>> from plone.app.testing import TEST_USER_NAME
     >>> from plone.app.testing import TEST_USER_PASSWORD
-    >>> from plone.testing.z2 import Browser
+    >>> from plone.testing.zope import Browser
 
     >>> app = layer['app']
     >>> portal = layer['portal']
diff --git a/plone/app/users/tests/personal_preferences.rst b/plone/app/users/tests/personal_preferences.rst
index b0d3fe0..c728ec6 100644
--- a/plone/app/users/tests/personal_preferences.rst
+++ b/plone/app/users/tests/personal_preferences.rst
@@ -8,7 +8,7 @@ Set up
 
     >>> from plone.app.testing import TEST_USER_NAME
     >>> from plone.app.testing import TEST_USER_PASSWORD
-    >>> from plone.testing.z2 import Browser
+    >>> from plone.testing.zope import Browser
 
     >>> app = layer['app']
     >>> portal = layer['portal']
diff --git a/plone/app/users/tests/personal_preferences_prefs_user_details.rst b/plone/app/users/tests/personal_preferences_prefs_user_details.rst
index 4b3745d..460eb73 100644
--- a/plone/app/users/tests/personal_preferences_prefs_user_details.rst
+++ b/plone/app/users/tests/personal_preferences_prefs_user_details.rst
@@ -6,7 +6,7 @@ Set up
 
     >>> from plone.app.testing import TEST_USER_NAME
     >>> from plone.app.testing import SITE_OWNER_PASSWORD
-    >>> from plone.testing.z2 import Browser
+    >>> from plone.testing.zope import Browser
 
     >>> app = layer['app']
     >>> portal = layer['portal']
diff --git a/plone/app/users/tests/registration_forms.rst b/plone/app/users/tests/registration_forms.rst
index e891896..97b209c 100644
--- a/plone/app/users/tests/registration_forms.rst
+++ b/plone/app/users/tests/registration_forms.rst
@@ -12,7 +12,7 @@ Testing the flexible user registration
 
     >>> import transaction
     >>> transaction.commit()
-    >>> from plone.testing.z2 import Browser
+    >>> from plone.testing.zope import Browser
     >>> browser = Browser(layer['app'])
     >>> browser.open('http://nohost/plone')
     >>> list_widget_suffix = ':list'
diff --git a/plone/app/users/tests/test_account.py b/plone/app/users/tests/test_account.py
index 084d121..a71aec9 100644
--- a/plone/app/users/tests/test_account.py
+++ b/plone/app/users/tests/test_account.py
@@ -1,5 +1,5 @@
 from plone.app.users.browser.account import AccountPanelSchemaAdapter
-from plone.testing import z2
+from plone.testing import zope
 from Products.CMFCore.interfaces import IMembershipTool
 from zope.component import provideUtility
 from zope.interface import implementer
@@ -23,7 +23,7 @@ def checkPermission(self, permission, context):
 
 
 class TestAccountPanelSchemaAdapter(unittest.TestCase):
-    layer = z2.INTEGRATION_TESTING
+    layer = zope.INTEGRATION_TESTING
 
     def test__init__no_userid(self):
         """Should edit current user."""
diff --git a/plone/app/users/tests/test_pam.py b/plone/app/users/tests/test_pam.py
index 5e4a94b..70dd736 100644
--- a/plone/app/users/tests/test_pam.py
+++ b/plone/app/users/tests/test_pam.py
@@ -7,7 +7,7 @@
 from plone.app.testing import TEST_USER_NAME
 from plone.app.testing import TEST_USER_PASSWORD
 from plone.app.testing.layers import FunctionalTesting
-from plone.testing import z2
+from plone.testing import zope
 from Products.CMFCore.utils import getToolByName
 
 import unittest
@@ -36,7 +36,7 @@ class TestUserDataPanelWithPAM(unittest.TestCase):
     layer = WITHPAM_FUNCTIONAL_TESTING
 
     def test_pam(self):
-        browser = z2.Browser(self.layer["app"])
+        browser = zope.Browser(self.layer["app"])
         browser.addHeader(
             "Authorization", f"Basic {TEST_USER_NAME}:{TEST_USER_PASSWORD}"
         )
diff --git a/plone/app/users/tests/test_schema_types.py b/plone/app/users/tests/test_schema_types.py
index d943cdf..9783a69 100644
--- a/plone/app/users/tests/test_schema_types.py
+++ b/plone/app/users/tests/test_schema_types.py
@@ -6,7 +6,7 @@
 from plone.app.testing import TEST_USER_PASSWORD
 from plone.app.users.setuphandlers import import_schema
 from plone.app.users.tests.base import BaseTestCase
-from plone.testing.z2 import Browser
+from plone.testing.zope import Browser
 from Products.GenericSetup.tests.common import DummyImportContext
 
 import transaction
diff --git a/plone/app/users/tests/userdata.rst b/plone/app/users/tests/userdata.rst
index 2449697..f9fe604 100644
--- a/plone/app/users/tests/userdata.rst
+++ b/plone/app/users/tests/userdata.rst
@@ -8,7 +8,7 @@ Set Up
     >>> from plone.app.testing import TEST_USER_ID
     >>> from plone.app.testing import TEST_USER_NAME
     >>> from plone.app.testing import TEST_USER_PASSWORD
-    >>> from plone.testing.z2 import Browser
+    >>> from plone.testing.zope import Browser
 
     >>> import transaction
 
diff --git a/plone/app/users/tests/userdata_prefs_user_details.rst b/plone/app/users/tests/userdata_prefs_user_details.rst
index dcc7e45..90606da 100644
--- a/plone/app/users/tests/userdata_prefs_user_details.rst
+++ b/plone/app/users/tests/userdata_prefs_user_details.rst
@@ -7,7 +7,7 @@ Set Up
     >>> from plone.app.testing import SITE_OWNER_PASSWORD
     >>> from plone.app.testing import TEST_USER_ID
     >>> from plone.app.testing import TEST_USER_NAME
-    >>> from plone.testing.z2 import Browser
+    >>> from plone.testing.zope import Browser
 
     >>> import transaction
 
diff --git a/setup.py b/setup.py
index 12ad8f9..51ece33 100644
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,6 @@
         "Products.PlonePAS >= 5.0.1",
         "Products.statusmessages",
         "Zope",
-        "plone.app.layout",
         "plone.autoform >= 1.2",
         "plone.app.event",
         "plone.app.vocabularies",