diff --git a/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java b/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
index e9ba62c055..c3ad3b964e 100644
--- a/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
+++ b/source/java/org/alfresco/rest/api/impl/QuickShareLinksImpl.java
@@ -220,24 +220,20 @@ public class QuickShareLinksImpl implements QuickShareLinks, InitializingBean
             String networkTenantDomain = pair.getFirst();
             final NodeRef nodeRef = pair.getSecond();
 
-            return TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork<BinaryResource>()
-            {
-                public BinaryResource doWork() throws Exception
+            return TenantUtil.runAsSystemTenant(() -> {
+                // belt-and-braces (similar to QuickShareContentGet)
+                if (!nodeService.hasAspect(nodeRef, QuickShareModel.ASPECT_QSHARE))
                 {
-                    // belt-and-braces (similar to QuickShareContentGet)
-                    if (!nodeService.hasAspect(nodeRef, QuickShareModel.ASPECT_QSHARE))
-                    {
-                        throw new InvalidNodeRefException(nodeRef);
-                    }
+                    throw new InvalidNodeRefException(nodeRef);
+                }
 
-                    if (renditionId != null)
-                    {
-                        return renditions.getContent(nodeRef, renditionId, parameters);
-                    }
-                    else
-                    {
-                        return nodes.getContent(nodeRef, parameters, false);
-                    }
+                if (renditionId != null)
+                {
+                    return renditions.getContent(nodeRef, renditionId, parameters);
+                }
+                else
+                {
+                    return nodes.getContent(nodeRef, parameters, false);
                 }
             }, networkTenantDomain);
         }
@@ -403,21 +399,17 @@ public class QuickShareLinksImpl implements QuickShareLinks, InitializingBean
             String networkTenantDomain = pair.getFirst();
             final NodeRef nodeRef = pair.getSecond();
 
-            return TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork<CollectionWithPagingInfo<Rendition>>()
-            {
-                public CollectionWithPagingInfo<Rendition> doWork() throws Exception
-                {
-                    String nodeId = nodeRef.getId();
+            return TenantUtil.runAsSystemTenant(() -> {
+                String nodeId = nodeRef.getId();
 
-                    // hmm ... can we simplify ?
-                    String filterStatusCreated = "("+Renditions.PARAM_STATUS+"='"+Rendition.RenditionStatus.CREATED+"')";
-                    Query whereQuery = ResourceWebScriptHelper.getWhereClause(filterStatusCreated);
-                    Params.RecognizedParams recParams = new Params.RecognizedParams(null, null, null, null, null, null, whereQuery, null, false);
-                    Parameters params = Params.valueOf(recParams, null, null, null);
+                // hmm ... can we simplify ?
+                String filterStatusCreated = "(" + Renditions.PARAM_STATUS + "='" + Rendition.RenditionStatus.CREATED + "')";
+                Query whereQuery = ResourceWebScriptHelper.getWhereClause(filterStatusCreated);
+                Params.RecognizedParams recParams = new Params.RecognizedParams(null, null, null, null, null, null, whereQuery, null, false);
+                Parameters params = Params.valueOf(recParams, null, null, null);
 
-                    return renditions.getRenditions(nodeId, params);
+                return renditions.getRenditions(nodeId, params);
 
-                }
             }, networkTenantDomain);
         }
         catch (InvalidSharedIdException ex)
diff --git a/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java b/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
index be2ea2c20f..47541b2c7f 100644
--- a/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
+++ b/source/test-java/org/alfresco/rest/api/tests/AbstractBaseApiTest.java
@@ -33,6 +33,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.tenant.TenantUtil;
+import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
 import org.alfresco.rest.api.Nodes;
 import org.alfresco.rest.api.model.Site;
 import org.alfresco.rest.api.nodes.NodesEntityResource;
@@ -380,14 +381,9 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
     {
         final String siteName = "RandomSite" + System.currentTimeMillis();
 
-        final TestSite site = TenantUtil.runAsUserTenant(new TenantUtil.TenantRunAsWork<TestSite>()
-        {
-            @Override
-            public TestSite doWork() throws Exception
-            {
-                SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, siteVisibility);
-                return repoService.createSite(testNetwork, siteInfo);
-            }
+        final TestSite site = TenantUtil.runAsUserTenant(() -> {
+            SiteInformation siteInfo = new SiteInformation(siteName, siteName, siteName, siteVisibility);
+            return repoService.createSite(testNetwork, siteInfo);
         }, user.getId(), testNetwork.getId());
 
         return site;
@@ -446,27 +442,15 @@ public abstract class AbstractBaseApiTest extends EnterpriseTestApi
 
     protected void inviteToSite(final TestSite testSite, final TestPerson invitee, final SiteRole siteRole)
     {
-        TenantUtil.runAsTenant(new TenantUtil.TenantRunAsWork<Void>()
-        {
-            @Override
-            public Void doWork() throws Exception
-            {
-                testSite.inviteToSite(invitee.getId(), siteRole);
-                return null;
-            }
+        TenantUtil.runAsTenant((TenantRunAsWork<Void>) () -> {
+            testSite.inviteToSite(invitee.getId(), siteRole);
+            return null;
         }, testSite.getNetworkId());
     }
 
     protected NodeRef getSiteDocLib(final TestSite testSite)
     {
-        return TenantUtil.runAsTenant(new TenantUtil.TenantRunAsWork<NodeRef>()
-        {
-            @Override
-            public NodeRef doWork() throws Exception
-            {
-                return testSite.getContainerNodeRef(("documentLibrary"));
-            }
-        }, testSite.getNetworkId());
+        return TenantUtil.runAsTenant(() -> testSite.getContainerNodeRef(("documentLibrary")), testSite.getNetworkId());
     }
 
     protected void checkStatus(int expectedStatus, int actualStatus)