diff --git a/platform/commonUI/edit/test/capabilities/EditableContextCapabilitySpec.js b/platform/commonUI/edit/test/capabilities/EditableContextCapabilitySpec.js
index 7beeb7c548..0ba6160601 100644
--- a/platform/commonUI/edit/test/capabilities/EditableContextCapabilitySpec.js
+++ b/platform/commonUI/edit/test/capabilities/EditableContextCapabilitySpec.js
@@ -19,18 +19,22 @@ define(
                 // methods for domain objects, so give it an
                 // arbitrary interface to wrap.
                 mockContext =
-                    jasmine.createSpyObj("context", [ "getDomainObject" ]);
+                    jasmine.createSpyObj("context", [ "getDomainObject", "getRoot" ]);
                 mockTestObject = jasmine.createSpyObj(
                     "domainObject",
                     [ "getId", "getModel", "getCapability" ]
                 );
-                mockFactory =
-                    jasmine.createSpyObj("factory", ["getEditableObject"]);
+                mockFactory = jasmine.createSpyObj(
+                    "factory",
+                    ["getEditableObject", "isRoot"]
+                );
 
                 someValue = { x: 42 };
 
+                mockContext.getRoot.andReturn(mockTestObject);
                 mockContext.getDomainObject.andReturn(mockTestObject);
                 mockFactory.getEditableObject.andReturn(someValue);
+                mockFactory.isRoot.andReturn(true);
 
                 capability = new EditableContextCapability(
                     mockContext,
diff --git a/platform/commonUI/edit/test/controllers/EditPanesControllerSpec.js b/platform/commonUI/edit/test/controllers/EditPanesControllerSpec.js
index 51bca0f217..ecc81801df 100644
--- a/platform/commonUI/edit/test/controllers/EditPanesControllerSpec.js
+++ b/platform/commonUI/edit/test/controllers/EditPanesControllerSpec.js
@@ -19,14 +19,14 @@ define(
                 );
                 mockContext = jasmine.createSpyObj(
                     'context',
-                    [ 'getRoot' ]
+                    [ 'getTrueRoot' ]
                 );
 
                 mockDomainObject.getId.andReturn('test-id');
                 mockDomainObject.getCapability.andReturn(mockContext);
 
                 // Return a new instance of the root object each time
-                mockContext.getRoot.andCallFake(function () {
+                mockContext.getTrueRoot.andCallFake(function () {
                     var mockRoot = jasmine.createSpyObj('root', ['getId']);
                     mockRoot.getId.andReturn('root-id');
                     return mockRoot;
@@ -75,7 +75,7 @@ define(
                 firstRoot = controller.getRoot();
 
                 // Change the exposed root
-                mockContext.getRoot.andCallFake(function () {
+                mockContext.getTrueRoot.andCallFake(function () {
                     var mockRoot = jasmine.createSpyObj('root', ['getId']);
                     mockRoot.getId.andReturn('other-root-id');
                     return mockRoot;