--- a/devtools/client/webconsole/new-console-output/test/fixtures/L10n.js
+++ b/devtools/client/webconsole/new-console-output/test/fixtures/L10n.js
@@ -10,18 +10,19 @@ class L10n {
       case "level.error":
         return "Error";
       case "consoleCleared":
         return "Console was cleared.";
       case "webConsoleXhrIndicator":
         return "XHR";
       case "webConsoleMoreInfoLabel":
         return "Learn More";
+      default:
+        return str;
     }
-    return str;
   }
 
   getFormatStr(str) {
     return this.getStr(str);
   }
 }
 
 module.exports = L10n;

--- a/devtools/client/webconsole/new-console-output/test/require-helper.js
+++ b/devtools/client/webconsole/new-console-output/test/require-helper.js
@@ -2,27 +2,30 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
 const requireHacker = require("require-hacker");
 
 requireHacker.global_hook("default", path => {
   switch (path) {
     // For Enzyme
+    case "react-dom":
     case "react-dom/server":
-      return `const React = require('react-dev'); module.exports = React`;
+      return `const React = require('devtools/client/shared/vendor/react-dev'); module.exports = React`;
     case "react-addons-test-utils":
-      return `const React = require('react-dev'); module.exports = React.addons.TestUtils`;
+      return `const React = require('devtools/client/shared/vendor/react-dev'); module.exports = React.addons.TestUtils`;
+    case "react-redux":
+      return `const ReactRedux = require('devtools/client/shared/vendor/react-redux'); module.exports = ReactRedux`;
     // Use react-dev. This would be handled by browserLoader in Firefox.
     case "react":
     case "devtools/client/shared/vendor/react":
-      return `const React = require('react-dev'); module.exports = React`;
+      return `const React = require('devtools/client/shared/vendor/react-dev'); module.exports = React`;
     // For Rep's use of AMD
     case "devtools/client/shared/vendor/react.default":
-      return `const React = require('react-dev'); module.exports = React`;
+      return `const React = require('devtools/client/shared/vendor/react-dev'); module.exports = React`;
   }
 
   // Some modules depend on Chrome APIs which don't work in mocha. When such a module
   // is required, replace it with a mock version.
   switch (path) {
     case "devtools/client/webconsole/utils":
       return `module.exports = require("devtools/client/webconsole/new-console-output/test/fixtures/WebConsoleUtils")`;
     case "devtools/shared/l10n":

--- a/devtools/client/webconsole/package.json
+++ b/devtools/client/webconsole/package.json
@@ -1,20 +1,21 @@
 {
   "name": "webconsole",
   "version": "0.0.1",
   "devDependencies": {
     "amd-loader": "0.0.5",
     "babel-preset-es2015": "^6.6.0",
     "babel-register": "^6.7.2",
+    "cross-env": "^3.1.3",
     "enzyme": "^2.4.1",
     "expect": "^1.16.0",
     "jsdom": "^9.4.1",
     "jsdom-global": "^2.0.0",
     "mocha": "^2.5.3",
     "require-hacker": "^2.1.4",
     "sinon": "^1.17.5"
   },
   "scripts": {
     "postinstall": "cd ../ && npm install && cd webconsole",
-    "test": "NODE_PATH=`pwd`/../../../:`pwd`/../../../devtools/client/shared/vendor/ mocha new-console-output/test/**/*.test.js --compilers js:babel-register -r jsdom-global/register -r ./new-console-output/test/require-helper.js"
+    "test": "cross-env NODE_PATH=../../../ mocha new-console-output/test/**/*.test.js --compilers js:babel-register -r jsdom-global/register -r ./new-console-output/test/require-helper.js"
   }
 }