diff --git a/package.json b/package.json
index 1ce266ae6bce..c94bdb3990b6 100644
--- a/package.json
+++ b/package.json
@@ -17,9 +17,7 @@
     "@types/node": "^8.5.9",
     "coveralls": "^3.0.0",
     "cz-conventional-changelog": "^2.1.0",
-    "lerna": "^2.5.1",
-    "mocha": "^5.0.0",
-    "source-map-support": "^0.5.2"
+    "lerna": "^2.8.0"
   },
   "scripts": {
     "bootstrap": "npm i && lerna bootstrap",
@@ -41,7 +39,7 @@
     "build:full": "npm run clean:full && npm run bootstrap && npm run build && npm run mocha && npm run lint",
     "pretest": "npm run clean && npm run build:current",
     "test": "node packages/build/bin/run-nyc npm run mocha",
-    "mocha": "node packages/build/bin/select-dist mocha --opts packages/build/mocha.ts.opts \"packages/*/DIST/test/**/*.js\" \"packages/cli/test/*.js\"",
+    "mocha": "node packages/build/bin/run-mocha \"packages/*/DIST/test/**/*.js\" \"packages/cli/test/*.js\"",
     "posttest": "npm run lint"
   },
   "config": {
diff --git a/packages/authentication/package.json b/packages/authentication/package.json
index cac7a25e4137..bbd75cde915e 100644
--- a/packages/authentication/package.json
+++ b/packages/authentication/package.json
@@ -6,18 +6,18 @@
     "node": ">=6"
   },
   "scripts": {
-    "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/acceptance/**/*.js'",
+    "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
     "build": "npm run build:dist && npm run build:dist6",
     "build:current": "lb-tsc",
     "build:dist": "lb-tsc es2017",
     "build:dist6": "lb-tsc es2015",
     "build:apidocs": "lb-apidocs",
     "clean": "lb-clean loopback-authentication*.tgz dist dist6 package api-docs",
-    "integration": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/integration/**/*.js'",
+    "integration": "lb-mocha \"DIST/test/integration/**/*.js\"",
     "prepare": "npm run build && npm run build:apidocs",
     "pretest": "npm run build:current",
-    "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/integration/**/*.js' 'DIST/test/acceptance/**/*.js'",
-    "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'",
+    "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/integration/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
+    "unit": "lb-mocha \"DIST/test/unit/**/*.js\"",
     "verify": "npm pack && tar xf loopback-authentication*.tgz && tree package && npm run clean"
   },
   "author": "IBM",
diff --git a/packages/build/README.md b/packages/build/README.md
index 4a4bc2eb60ee..659982cf1643 100644
--- a/packages/build/README.md
+++ b/packages/build/README.md
@@ -3,10 +3,12 @@
 This module contains a set of common scripts and default configurations to build LoopBack 4 or other TypeScript modules, including:
 
 - lb-tsc: Use [`tsc`](https://www.typescriptlang.org/docs/handbook/compiler-options.html) to compile typescript files
-- lb-dist: Detect the correct distribution target: `dist` => ES2017, `dist6` => ES2015
 - lb-tslint: Run [`tslint`](https://github.com/palantir/tslint)
 - lb-prettier: Run [`prettier`](https://github.com/prettier/prettier)
+- lb-mocha: Run [`mocha`](https://mochajs.org/) to execute test cases
 - lb-nyc: Run [`nyc`](https://github.com/istanbuljs/nyc)
+- lb-dist: Detect the correct distribution target: `dist` => ES2017, `dist6` => ES2015.
+  The command is deprecated as `lb-mocha` detects the distribution target now.
 
 These scripts first try to locate the CLI from target project dependencies and fall back to bundled ones in `@loopback/build`.
 
@@ -19,6 +21,7 @@ To use `@loopback/build` for your package:
 `npm i @loopback/build --save-dev`
 
 2. Configure your project package.json as follows:
+
 ```json
 "scripts": {
     "build": "npm run build:dist && npm run build:dist6",
@@ -33,17 +36,19 @@ To use `@loopback/build` for your package:
     "prettier:fix": "npm run prettier:cli -- --write",
     "lint": "npm run prettier:check && npm run tslint",
     "lint:fix": "npm run prettier:fix && npm run tslint:fix",
-    "clean": "lb-clean loopback-grpc*.tgz dist*",
+    "clean": "lb-clean your-module-name*.tgz dist* api-docs",
     "prepare": "npm run build && npm run build:apidocs",
     "pretest": "npm run build:current",
-    "acceptance": "lb-dist mocha --opts ../../test/mocha.opts 'DIST/test/acceptance/**/*.js'",
-    "integration": "lb-dist mocha --opts ../../test/mocha.opts 'DIST/test/integration/**/*.js'",
-    "test": "lb-dist mocha --opts ../../test/mocha.opts 'DIST/test/unit/**/*.js' 'DIST/test/integration/**/*.js' 'DIST/test/acceptance/**/*.js'",
-    "unit": "lb-dist mocha --opts ../../test/mocha.opts 'DIST/test/unit/**/*.js'",
-    "verify": "npm pack && tar xf loopback-grpc*.tgz && tree package && npm run clean"
+    "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
+    "integration": "lb-mocha \"DIST/test/integration/**/*.js\"",
+    "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/integration/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
+    "unit": "lb-mocha \"DIST/test/unit/**/*.js\"",
+    "verify": "npm pack && tar xf your-module-name*.tgz && tree package && npm run clean"
   },
 ```
 
+Please remember to replace `your-module-name` with the name of your module.
+
 Now you run the scripts, such as:
 
 - `npm run build` - Compile TypeScript files
diff --git a/packages/build/bin/run-mocha.js b/packages/build/bin/run-mocha.js
new file mode 100755
index 000000000000..93a01ca2351d
--- /dev/null
+++ b/packages/build/bin/run-mocha.js
@@ -0,0 +1,46 @@
+#!/usr/bin/env node
+// Copyright IBM Corp. 2017,2018. All Rights Reserved.
+// Node module: @loopback/build
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
+/*
+========
+
+Usage:
+  node ./bin/run-mocha
+
+========
+*/
+
+'use strict';
+
+function run(argv, dryRun) {
+  const utils = require('./utils');
+  const path = require('path');
+
+  // Substitute the DIST variable with the dist folder
+  const dist = utils.getDistribution();
+  const mochaOpts = argv.slice(2).map(a => a.replace(/\bDIST\b/g, dist));
+
+  // Add default options
+  if (mochaOpts.indexOf('--opts') === -1) {
+    const optsPath = require.resolve('../mocha.opts');
+    mochaOpts.unshift('--opts', optsPath);
+  }
+
+  // Add source map support
+  if (mochaOpts.indexOf('source-map-support/register') === -1) {
+    // Resolve source-map-support so that the path can be used by mocha
+    const sourceMapRegisterPath = require.resolve(
+      'source-map-support/register'
+    );
+    mochaOpts.unshift('--require', sourceMapRegisterPath);
+  }
+  const args = [...mochaOpts];
+
+  return utils.runCLI('mocha/bin/mocha', args, dryRun);
+}
+
+module.exports = run;
+if (require.main === module) run(process.argv);
diff --git a/packages/build/docs.json b/packages/build/docs.json
index cab4a8ad246f..d7ddb4e64409 100644
--- a/packages/build/docs.json
+++ b/packages/build/docs.json
@@ -5,6 +5,7 @@
     "bin/generate-apidocs.js",
     "bin/run-clean.js",
     "bin/run-nyc.js",
+    "bin/run-mocha.js",
     "bin/run-prettier.js",
     "bin/run-tslint.js",
     "bin/select-dist.js",
diff --git a/packages/build/mocha.js.opts b/packages/build/mocha.opts
similarity index 100%
rename from packages/build/mocha.js.opts
rename to packages/build/mocha.opts
diff --git a/packages/build/mocha.ts.opts b/packages/build/mocha.ts.opts
deleted file mode 100644
index 0cf9a4cfa1a4..000000000000
--- a/packages/build/mocha.ts.opts
+++ /dev/null
@@ -1,4 +0,0 @@
---recursive
---exit
---reporter dot
---require source-map-support/register
diff --git a/packages/build/package.json b/packages/build/package.json
index 5437eb0b1184..24015016732c 100644
--- a/packages/build/package.json
+++ b/packages/build/package.json
@@ -20,6 +20,7 @@
     "mocha": "^5.0.0",
     "nyc": "^11.4.1",
     "prettier": "^1.10.2",
+    "source-map-support": "^0.5.3",
     "strong-docs": "^1.6.0",
     "tslint": "^5.9.1",
     "typescript": "^2.6.2"
@@ -28,6 +29,7 @@
     "lb-tsc": "./bin/compile-package.js",
     "lb-tslint": "./bin/run-tslint.js",
     "lb-prettier": "./bin/run-prettier.js",
+    "lb-mocha": "./bin/run-mocha.js",
     "lb-nyc": "./bin/run-nyc.js",
     "lb-dist": "./bin/select-dist.js",
     "lb-apidocs": "./bin/generate-apidocs.js",
@@ -40,7 +42,7 @@
     "prettier:check": "npm run prettier:cli -- -l",
     "prettier:fix": "npm run prettier:cli -- --write",
     "test": "npm run mocha",
-    "mocha": "node bin/select-dist mocha --opts mocha.js.opts --timeout 30000 \"test/integration/*.js\"",
+    "mocha": "node bin/run-mocha --timeout 30000 \"test/integration/*.js\"",
     "posttest": "npm run lint"
   },
   "devDependencies": {
diff --git a/packages/cli/generators/project/templates/package.json b/packages/cli/generators/project/templates/package.json
index a7f25edaa1b8..6496ee6a0878 100644
--- a/packages/cli/generators/project/templates/package.json
+++ b/packages/cli/generators/project/templates/package.json
@@ -35,7 +35,7 @@
 <% } -%>
     "pretest": "npm run clean && npm run build",
 <% if (project.mocha) { -%>
-    "test": "lb-dist mocha DIST/test",
+    "test": "lb-mocha \"DIST/test\"",
 <% } -%>
 <% if (project.prettier || project.tslint) { -%>
     "posttest": "npm run lint",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 93afa8fcf86e..1c9b66d736a5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -24,6 +24,7 @@
     "yeoman-generator"
   ],
   "devDependencies": {
+    "@loopback/build": "^4.0.0-alpha.9",
     "@loopback/testlab": "^4.0.0-alpha.19",
     "eslint-config-google": "^0.9.1",
     "glob": "^7.1.2",
@@ -54,7 +55,7 @@
   },
   "scripts": {
     "prepublishOnly": "nsp check",
-    "test": "mocha --opts node_modules/@loopback/build/mocha.js.opts \"test/*.js\""
+    "test": "lb-mocha \"test/*.js\""
   },
   "repository": {
     "type": "git",
diff --git a/packages/cli/test/clone-example.test.js b/packages/cli/test/clone-example.test.js
index 4b67a5a59a6e..f5dda0a25531 100644
--- a/packages/cli/test/clone-example.test.js
+++ b/packages/cli/test/clone-example.test.js
@@ -30,7 +30,7 @@ describe('cloneExampleFromGitHub', function() {
         return Promise.all([
           glob('**', {
             cwd: path.join(__dirname, `../../example-${VALID_EXAMPLE}`),
-            ignore: '@(node_modules|dist*)/**',
+            ignore: '@(node_modules|dist*|api-docs)/**',
           }),
           glob('**', {
             cwd: outDir,
diff --git a/packages/context/package.json b/packages/context/package.json
index 6161924ba223..18699d1fa5b0 100644
--- a/packages/context/package.json
+++ b/packages/context/package.json
@@ -6,7 +6,7 @@
     "node": ">=6"
   },
   "scripts": {
-    "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/acceptance/**/*.js'",
+    "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
     "build": "npm run build:dist && npm run build:dist6",
     "build:current": "lb-tsc",
     "build:dist": "lb-tsc es2017",
@@ -15,8 +15,8 @@
     "clean": "lb-clean loopback-context*.tgz dist dist6 package api-docs",
     "prepare": "npm run build && npm run build:apidocs",
     "pretest": "npm run build:current",
-    "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/acceptance/**/*.js'",
-    "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'",
+    "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
+    "unit": "lb-mocha \"DIST/test/unit/**/*.js\"",
     "verify": "npm pack && tar xf loopback-context*.tgz && tree package && npm run clean"
   },
   "author": "IBM",
diff --git a/packages/core/package.json b/packages/core/package.json
index f88fcacc12ea..3d944209eefe 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -6,7 +6,7 @@
     "node": ">=6"
   },
   "scripts": {
-    "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/acceptance/**/*.js'",
+    "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
     "build": "npm run build:dist && npm run build:dist6",
     "build:current": "lb-tsc",
     "build:dist": "lb-tsc es2017",
@@ -15,9 +15,9 @@
     "clean": "lb-clean loopback-core*.tgz dist dist6 package api-docs",
     "prepare": "npm run build && npm run build:apidocs",
     "pretest": "npm run build:current",
-    "integration": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/integration/**/*.js'",
-    "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/integration/**/*.js' 'DIST/test/acceptance/**/*.js'",
-    "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'",
+    "integration": "lb-mocha \"DIST/test/integration/**/*.js\"",
+    "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/integration/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
+    "unit": "lb-mocha \"DIST/test/unit/**/*.js\"",
     "verify": "npm pack && tar xf loopback-core*.tgz && tree package && npm run clean"
   },
   "author": "IBM",
diff --git a/packages/example-getting-started/package.json b/packages/example-getting-started/package.json
index 056679008432..6c160b2ecd27 100644
--- a/packages/example-getting-started/package.json
+++ b/packages/example-getting-started/package.json
@@ -8,7 +8,7 @@
     "node": ">=8"
   },
   "scripts": {
-    "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/acceptance/**/*.js'",
+    "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
     "build": "npm run build:dist && npm run build:dist6",
     "build:current": "lb-tsc",
     "build:dist": "lb-tsc es2017",
@@ -17,9 +17,9 @@
     "clean": "lb-clean *example-getting-started*.tgz dist dist6 package api-docs",
     "prepare": "npm run build && npm run build:apidocs",
     "pretest": "npm run build:current",
-    "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/acceptance/**/*.js'",
-    "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'",
-    "verify": "npm pack && tar xf *example-getting-started*.tgz && tree package && npm run clean",
+    "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
+    "unit": "lb-mocha \"DIST/test/unit/**/*.js\"",
+    "verify": "npm pack && tar xf loopback-getting-started*.tgz && tree package && npm run clean",
     "start": "npm run build && node ."
   },
   "repository": {
diff --git a/packages/example-log-extension/package.json b/packages/example-log-extension/package.json
index 25e1a9ae8731..37aa220ad1d3 100644
--- a/packages/example-log-extension/package.json
+++ b/packages/example-log-extension/package.json
@@ -23,7 +23,7 @@
     "tslint:fix": "npm run tslint -- --fix",
     "prepare": "npm run build",
     "pretest": "npm run clean && npm run build:current",
-    "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/acceptance/**/*.js'",
+    "test": "lb-dist mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
     "posttest": "npm run lint",
     "verify": "npm pack && tar xf *example-log-extension*.tgz && tree package && npm run clean"
   },
diff --git a/packages/metadata/package.json b/packages/metadata/package.json
index 422d1ad2a77f..7c73b8fc2bbd 100644
--- a/packages/metadata/package.json
+++ b/packages/metadata/package.json
@@ -6,7 +6,7 @@
     "node": ">=6"
   },
   "scripts": {
-    "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/acceptance/**/*.js'",
+    "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
     "build": "npm run build:dist && npm run build:dist6",
     "build:current": "lb-tsc",
     "build:dist": "lb-tsc es2017",
@@ -15,8 +15,8 @@
     "clean": "lb-clean loopback-metadata*.tgz dist dist6 package api-docs",
     "prepare": "npm run build && npm run build:apidocs",
     "pretest": "npm run build:current",
-    "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/acceptance/**/*.js'",
-    "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'",
+    "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
+    "unit": "lb-mocha \"DIST/test/unit/**/*.js\"",
     "verify": "npm pack && tar xf loopback-metadata*.tgz && tree package && npm run clean"
   },
   "author": "IBM",
diff --git a/packages/metadata/test/unit/inspector.test.ts b/packages/metadata/test/unit/inspector.test.ts
index 5ae319628852..004efecc8927 100644
--- a/packages/metadata/test/unit/inspector.test.ts
+++ b/packages/metadata/test/unit/inspector.test.ts
@@ -592,6 +592,8 @@ describe('Inspector for design time metadata', () => {
 
     @propertyDecorator() myArray: string[];
 
+    @propertyDecorator() myUnionType: string | number;
+
     @methodDecorator()
     myMethod(x: string, y: number): boolean {
       return false;
@@ -631,6 +633,15 @@ describe('Inspector for design time metadata', () => {
     expect(meta).to.eql(MyClass);
   });
 
+  it('inspects design time type for properties with union type', () => {
+    const meta = MetadataInspector.getDesignTypeForProperty(
+      MyController.prototype,
+      'myUnionType',
+    );
+    // Union type is recorded as Object
+    expect(meta).to.eql(Object);
+  });
+
   it('inspects design time type for static properties', () => {
     const meta = MetadataInspector.getDesignTypeForProperty(
       MyController,
diff --git a/packages/openapi-v2/package.json b/packages/openapi-v2/package.json
index 557e19781a2c..178ac1b1e243 100644
--- a/packages/openapi-v2/package.json
+++ b/packages/openapi-v2/package.json
@@ -10,6 +10,7 @@
     "@loopback/openapi-spec-builder": "^4.0.0-alpha.17",
     "@loopback/repository": "^4.0.0-alpha.23",
     "@loopback/testlab": "^4.0.0-alpha.19",
+    "@types/debug": "0.0.30",
     "@types/lodash": "^4.14.96"
   },
   "scripts": {
@@ -21,7 +22,7 @@
     "clean": "lb-clean loopback-openapi-v2*.tgz dist* package",
     "prepare": "npm run build && npm run build:apidocs",
     "pretest": "npm run build:current",
-    "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'",
+    "test": "lb-mocha \"DIST/test/unit/**/*.js\"",
     "verify": "npm pack && tar xf loopback-openapi-v2*.tgz && tree package && npm run clean"
   },
   "author": "IBM",
@@ -52,6 +53,7 @@
     "@loopback/context": "^4.0.0-alpha.26",
     "@loopback/openapi-spec": "^4.0.0-alpha.20",
     "@loopback/repository-json-schema": "^4.0.0-alpha.1",
+    "debug": "^3.1.0",
     "lodash": "^4.17.4"
   }
 }
diff --git a/packages/repository-json-schema/package.json b/packages/repository-json-schema/package.json
index 9112a09156b4..35b1fb3e9c80 100644
--- a/packages/repository-json-schema/package.json
+++ b/packages/repository-json-schema/package.json
@@ -14,7 +14,7 @@
     "clean": "lb-clean loopback-json-schema*.tgz dist dist6 package api-docs",
     "prepare": "npm run build && npm run build:apidocs",
     "pretest": "npm run build:current",
-    "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.opts 'dist/test/unit/**/*.js' 'dist/test/integration/**/*.js' 'dist/test/acceptance/**/*.js'",
+    "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/integration/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
     "verify": "npm pack && tar xf loopback-json-schema*.tgz && tree package && npm run clean"
   },
   "author": "IBM",
diff --git a/packages/repository/package.json b/packages/repository/package.json
index 1a3734c6c779..e3aaf9f87685 100644
--- a/packages/repository/package.json
+++ b/packages/repository/package.json
@@ -7,7 +7,7 @@
   },
   "main": "index",
   "scripts": {
-    "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/acceptance/**/*.js'",
+    "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
     "build": "npm run build:dist && npm run build:dist6",
     "build:current": "lb-tsc",
     "build:dist": "lb-tsc es2017",
@@ -16,8 +16,8 @@
     "clean": "lb-clean loopback-repository*.tgz dist dist6 package api-docs",
     "prepare": "npm run build && npm run build:apidocs",
     "pretest": "npm run build:current",
-    "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/acceptance/**/*.js'",
-    "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'",
+    "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
+    "unit": "lb-mocha \"DIST/test/unit/**/*.js\"",
     "verify": "npm pack && tar xf loopback-juggler*.tgz && tree package && npm run clean"
   },
   "author": "IBM",
diff --git a/packages/rest/package.json b/packages/rest/package.json
index c4977bfdc27f..105b0712af34 100644
--- a/packages/rest/package.json
+++ b/packages/rest/package.json
@@ -6,7 +6,7 @@
     "node": ">=6"
   },
   "scripts": {
-    "acceptance": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/acceptance/**/*.js'",
+    "acceptance": "lb-mocha \"DIST/test/acceptance/**/*.js\"",
     "build": "npm run build:dist && npm run build:dist6",
     "build:current": "lb-tsc",
     "build:dist": "lb-tsc es2017",
@@ -15,9 +15,9 @@
     "clean": "lb-clean loopback-rest*.tgz dist dist6 package api-docs",
     "prepare": "npm run build && npm run build:apidocs",
     "pretest": "npm run build:current",
-    "integration": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/integration/**/*.js'",
-    "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js' 'DIST/test/integration/**/*.js' 'DIST/test/acceptance/**/*.js'",
-    "unit": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts 'DIST/test/unit/**/*.js'",
+    "integration": "lb-mocha \"DIST/test/integration/**/*.js\"",
+    "test": "lb-mocha \"DIST/test/unit/**/*.js\" \"DIST/test/integration/**/*.js\" \"DIST/test/acceptance/**/*.js\"",
+    "unit": "lb-mocha \"DIST/test/unit/**/*.js\"",
     "verify": "npm pack && tar xf loopback-rest*.tgz && tree package && npm run clean"
   },
   "author": "IBM",
diff --git a/packages/testlab/package.json b/packages/testlab/package.json
index 7e7369706cd5..bf2df40ead8b 100644
--- a/packages/testlab/package.json
+++ b/packages/testlab/package.json
@@ -13,7 +13,7 @@
     "clean": "lb-clean loopback-testlab*.tgz dist dist6 package api-docs",
     "prepare": "npm run build",
     "pretest": "npm run build:current",
-    "test": "lb-dist mocha --opts node_modules/@loopback/build/mocha.ts.opts DIST/test",
+    "test": "lb-mocha \"DIST/test\"",
     "verify": "npm pack && tar xf loopback-testlab*.tgz && tree package && npm run clean"
   },
   "author": "IBM",