diff --git a/package.json b/package.json
index b5d15970d..570173117 100644
--- a/package.json
+++ b/package.json
@@ -99,6 +99,7 @@
         "istanbul": "0.4.5",
         "minami": "1.2.3",
         "mocha": "^5.2.0",
+        "mosca": "^2.8.3",
         "should": "^8.4.0",
         "sinon": "1.17.7",
         "stoppable": "^1.0.6",
diff --git a/test/editor/editor_helper.js b/test/editor/editor_helper.js
index 281988484..656ebe5c7 100644
--- a/test/editor/editor_helper.js
+++ b/test/editor/editor_helper.js
@@ -21,7 +21,7 @@ var fs = require('fs-extra');
 var path = require('path');
 var app = express();
 
-var RED = require("../../red/red.js");
+var RED = require("../../packages/node_modules/node-red/lib/red.js");
 
 var utilPage = require("./pageobjects/util/util_page");
 
diff --git a/test/editor/pageobjects/editor/workspace_page.js b/test/editor/pageobjects/editor/workspace_page.js
index e62eb686f..7eca9d25a 100644
--- a/test/editor/pageobjects/editor/workspace_page.js
+++ b/test/editor/pageobjects/editor/workspace_page.js
@@ -16,7 +16,7 @@
 
  var when = require("when");
 
-var events = require("../../../../red/runtime/events.js");
+var events = require("../../../../packages/node_modules/@node-red/runtime/lib/events.js");
 
 var palette = require("./palette_page");
 var nodeFactory = require("../nodes/nodefactory_page");
diff --git a/test/editor/pageobjects/nodes/core/core/58-debug_page.js b/test/editor/pageobjects/nodes/core/core/58-debug_page.js
index c8c1d8871..0dc4c298e 100644
--- a/test/editor/pageobjects/nodes/core/core/58-debug_page.js
+++ b/test/editor/pageobjects/nodes/core/core/58-debug_page.js
@@ -29,7 +29,7 @@ debugNode.prototype.setOutput = function(complete) {
     browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-container")]/button');
     if (complete !== 'true') {
         // Select the "msg" type.
-        browser.clickWithWait('/html/body/div[11]/a[1]');
+        browser.clickWithWait('//div[@class="red-ui-typedInput-options"][1]/a[1]');
         // Input the path in msg.
         browser.clickWithWait('//*[contains(@class, "red-ui-typedInput-input")]/input');
         browser.keys(['Control', 'a', 'Control']);
diff --git a/test/editor/pageobjects/nodes/core/logic/15-change_page.js b/test/editor/pageobjects/nodes/core/logic/15-change_page.js
index 1336e8069..51589f7b5 100644
--- a/test/editor/pageobjects/nodes/core/logic/15-change_page.js
+++ b/test/editor/pageobjects/nodes/core/logic/15-change_page.js
@@ -54,8 +54,8 @@ changeNode.prototype.ruleSet = function(p, pt, to, tot, index) {
     setT("set", index);
     if (pt) {
         browser.clickWithWait('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[1]/div/button[1]');
-        var num = 5 * index + 6;
-        var ptXPath = '/html/body/div[' + num + ']/a[' + ptType[pt] + ']';
+        var num = 5 * (index - 1) + 1;
+        var ptXPath = '//div[@class="red-ui-typedInput-options"][' + num + ']/a[' + ptType[pt] + ']';
         browser.clickWithWait(ptXPath);
     }
     if (p) {
@@ -63,8 +63,8 @@ changeNode.prototype.ruleSet = function(p, pt, to, tot, index) {
     }
     if (tot) {
         browser.clickWithWait('//*[@id="node-input-rule-container"]/li[' + index + ']/div/div[2]/div[2]/button[1]');
-        var num = 5 * index + 7;
-        var totXPath = '/html/body/div[' + num + ']/a[' + totType[tot] + ']';
+        var num = 5 * (index - 1) + 2;
+        var totXPath = '//div[@class="red-ui-typedInput-options"][' + num + ']/a[' + totType[tot] + ']';
         browser.clickWithWait(totXPath);
     }
     if (to) {
diff --git a/test/editor/specs/scenario/cookbook_endpoint_uispec.js b/test/editor/specs/scenario/cookbook_endpoint_uispec.js
index bb54da557..da672a747 100644
--- a/test/editor/specs/scenario/cookbook_endpoint_uispec.js
+++ b/test/editor/specs/scenario/cookbook_endpoint_uispec.js
@@ -315,8 +315,9 @@ describe('cookbook', function() {
             debugTab.open();
             debugTab.clearMessage();
             injectNode.clickLeftButton();
-            var message = debugTab.getMessage();
-            message[1].indexOf('application/json').should.not.eql(-1);
+            var messages = debugTab.getMessage();
+            var contents = messages.join([separator = ""]);
+            contents.indexOf('application/json').should.not.eql(-1);
         });
 
         it('serve a local file', function () {