diff --git a/src/plone/restapi/tests/test_comments.py b/src/plone/restapi/tests/test_comments.py
index 9f00f4bd54..1a29bcf2c3 100644
--- a/src/plone/restapi/tests/test_comments.py
+++ b/src/plone/restapi/tests/test_comments.py
@@ -7,8 +7,10 @@
 from plone.app.discussion.interfaces import IDiscussionSettings
 from plone.app.discussion.interfaces import IConversation
 from plone.app.discussion.interfaces import IReplies
+from plone.registry.interfaces import IRegistry
 
 from zope.component import createObject
+from zope.component import getUtility
 
 from plone import api
 
@@ -23,11 +25,11 @@ def setUp(self):
         self.portal_url = self.portal.absolute_url()
 
         # Allow discussion
-        api.portal.set_registry_record(
-            'globally_enabled',
-            True,
-            interface=IDiscussionSettings
-        )
+        registry = getUtility(IRegistry)
+        settings = registry.forInterface(IDiscussionSettings, check=False)
+        settings.globally_enabled = True
+        settings.edit_comment_enabled = True
+        settings.delete_own_comment_enabled = True
 
         # doc with comments
         self.doc = api.content.create(
diff --git a/src/plone/restapi/tests/test_documentation.py b/src/plone/restapi/tests/test_documentation.py
index 45ea3bfcc3..48c9c67560 100644
--- a/src/plone/restapi/tests/test_documentation.py
+++ b/src/plone/restapi/tests/test_documentation.py
@@ -16,11 +16,13 @@
 from plone.app.textfield.value import RichTextValue
 from plone.namedfile.file import NamedBlobFile
 from plone.namedfile.file import NamedBlobImage
+from plone.registry.interfaces import IRegistry
 from plone.restapi.testing import PLONE_RESTAPI_DX_FUNCTIONAL_TESTING
 from plone.restapi.testing import register_static_uuid_utility
 from plone.restapi.testing import RelativeSession
 from plone.testing.z2 import Browser
 from zope.component import createObject
+from zope.component import getUtility
 from zope.site.hooks import getSite
 
 import collections
@@ -812,23 +814,11 @@ def setUp(self):
         self.time_freezer = freeze_time("2016-10-21 19:00:00")
         self.frozen_time = self.time_freezer.start()
 
-        api.portal.set_registry_record(
-            'globally_enabled',
-            True,
-            interface=IDiscussionSettings
-        )
-
-        api.portal.set_registry_record(
-            'edit_comment_enabled',
-            True,
-            interface=IDiscussionSettings
-        )
-
-        api.portal.set_registry_record(
-            'delete_own_comment_enabled',
-            True,
-            interface=IDiscussionSettings
-        )
+        registry = getUtility(IRegistry)
+        settings = registry.forInterface(IDiscussionSettings, check=False)
+        settings.globally_enabled = True
+        settings.edit_comment_enabled = True
+        settings.delete_own_comment_enabled = True
 
         self.api_session = RelativeSession(self.portal_url)
         self.api_session.headers.update({'Accept': 'application/json'})
diff --git a/src/plone/restapi/tests/test_services_comments.py b/src/plone/restapi/tests/test_services_comments.py
index 639ece5922..620a28e4f4 100644
--- a/src/plone/restapi/tests/test_services_comments.py
+++ b/src/plone/restapi/tests/test_services_comments.py
@@ -2,11 +2,14 @@
 from plone import api
 from plone.app.testing import SITE_OWNER_NAME
 from plone.app.testing import SITE_OWNER_PASSWORD
+from plone.registry.interfaces import IRegistry
 from plone.restapi.testing import PLONE_RESTAPI_DX_FUNCTIONAL_TESTING
 from plone.restapi.testing import RelativeSession
 
 from plone.app.discussion.interfaces import IDiscussionSettings
 
+from zope.component import getUtility
+
 import transaction
 import unittest
 
@@ -22,23 +25,11 @@ def setUp(self):
         self.portal_url = self.portal.absolute_url()
 
         # Allow discussion
-        api.portal.set_registry_record(
-            'globally_enabled',
-            True,
-            interface=IDiscussionSettings
-        )
-
-        api.portal.set_registry_record(
-            'edit_comment_enabled',
-            True,
-            interface=IDiscussionSettings
-        )
-
-        api.portal.set_registry_record(
-            'delete_own_comment_enabled',
-            True,
-            interface=IDiscussionSettings
-        )
+        registry = getUtility(IRegistry)
+        settings = registry.forInterface(IDiscussionSettings, check=False)
+        settings.globally_enabled = True
+        settings.edit_comment_enabled = True
+        settings.delete_own_comment_enabled = True
 
         # doc with comments
         self.doc = api.content.create(