diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8fcc0c1b6..812ed4367 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -16,14 +16,6 @@
     "url": "https://github.com/react-native-community/react-native-cli.git"
   },
   "jest": {
-    "displayName": "cli",
-    "testPathIgnorePatterns": [
-      "/node_modules/",
-      "/templates/"
-    ],
-    "unmockedModulePathPatterns": [
-      "promise"
-    ],
     "testEnvironment": "node"
   },
   "dependencies": {
diff --git a/packages/cli/src/link/__tests__/link-test.js b/packages/cli/src/link/__tests__/link-test.js
index 55268dd30..3e292c7e1 100644
--- a/packages/cli/src/link/__tests__/link-test.js
+++ b/packages/cli/src/link/__tests__/link-test.js
@@ -9,7 +9,7 @@
  */
 
 jest.mock('chalk', () => ({ grey: str => str }));
-jest.mock('npmlog');
+jest.mock('../../util/logger');
 
 const context = {
   root: process.cwd(),
diff --git a/packages/cli/src/link/ios/createGroupWithMessage.js b/packages/cli/src/link/ios/createGroupWithMessage.js
index f89eb4299..aebdc7c2d 100644
--- a/packages/cli/src/link/ios/createGroupWithMessage.js
+++ b/packages/cli/src/link/ios/createGroupWithMessage.js
@@ -7,8 +7,7 @@
  * @format
  */
 
-const log = require('npmlog');
-
+const log = require('../../util/logger');
 const createGroup = require('./createGroup');
 const getGroup = require('./getGroup');
 
@@ -25,7 +24,6 @@ module.exports = function createGroupWithMessage(project, path) {
     group = createGroup(project, path);
 
     log.warn(
-      'ERRGROUP',
       `Group '${path}' does not exist in your Xcode project. We have created it automatically for you.`
     );
   }
diff --git a/packages/cli/src/link/ios/unlinkAssets.js b/packages/cli/src/link/ios/unlinkAssets.js
index 31108c6c8..8e4ef502e 100644
--- a/packages/cli/src/link/ios/unlinkAssets.js
+++ b/packages/cli/src/link/ios/unlinkAssets.js
@@ -9,8 +9,8 @@
 const fs = require('fs-extra');
 const path = require('path');
 const xcode = require('xcode');
-const log = require('npmlog');
 const { difference } = require('lodash');
+const log = require('../../util/logger');
 
 const groupFilesByType = require('../groupFilesByType');
 const getPlist = require('./getPlist');
@@ -27,16 +27,14 @@ module.exports = function unlinkAssetsIOS(files, projectConfig) {
 
   if (!plist) {
     log.error(
-      'ERRPLIST',
-      "Could not locate Info.plist file. Check if your project has 'INFOPLIST_FILE' set properly"
+      'Could not locate "Info.plist" file. Check if your project has "INFOPLIST_FILE" set properly'
     );
     return;
   }
 
   if (!project.pbxGroupByName('Resources')) {
     log.error(
-      'ERRGROUP',
-      "Group 'Resources' does not exist in your Xcode project. There is nothing to unlink."
+      'Group "Resources" does not exist in your Xcode project. There is nothing to unlink.'
     );
     return;
   }
diff --git a/packages/cli/src/link/link.js b/packages/cli/src/link/link.js
index 5a6f50609..c83522677 100644
--- a/packages/cli/src/link/link.js
+++ b/packages/cli/src/link/link.js
@@ -10,9 +10,9 @@
 
 import type { ContextT } from '../core/types.flow';
 
-const log = require('npmlog');
 const { pick } = require('lodash');
 const promiseWaterfall = require('./promiseWaterfall');
+const log = require('../util/logger');
 const getDependencyConfig = require('./getDependencyConfig');
 const commandStub = require('./commandStub');
 const promisify = require('./promisify');
@@ -20,13 +20,9 @@ const getProjectConfig = require('./getProjectConfig');
 const linkDependency = require('./linkDependency');
 const linkAssets = require('./linkAssets');
 const linkAll = require('./linkAll');
-
 const findReactNativeScripts = require('../util/findReactNativeScripts');
-
 const getPlatforms = require('../core/getPlatforms');
 
-log.heading = 'rnpm-link';
-
 type FlagsType = {
   platforms: Array<string>,
 };
@@ -47,10 +43,7 @@ function link([rawPackageName]: Array<string>, ctx: ContextT, opts: FlagsType) {
     }
     project = getProjectConfig(ctx, platforms);
   } catch (err) {
-    log.error(
-      'ERRPACKAGEJSON',
-      'No package found. Are you sure this is a React Native project?'
-    );
+    log.error('No package found. Are you sure this is a React Native project?');
     return Promise.reject(err);
   }
   const hasProjectConfig = Object.keys(platforms).reduce(
diff --git a/packages/cli/src/link/linkAll.js b/packages/cli/src/link/linkAll.js
index 1dbd559d5..1d99b01e6 100644
--- a/packages/cli/src/link/linkAll.js
+++ b/packages/cli/src/link/linkAll.js
@@ -2,9 +2,9 @@
 
 import type { ContextT, PlatformsT, ProjectConfigT } from '../core/types.flow';
 
-const log = require('npmlog');
 const { uniqBy, flatten } = require('lodash');
 const path = require('path');
+const log = require('../util/logger');
 const getAssets = require('../core/getAssets');
 const getProjectDependencies = require('./getProjectDependencies');
 const getDependencyConfig = require('./getDependencyConfig');
@@ -14,8 +14,6 @@ const promisify = require('./promisify');
 const linkAssets = require('./linkAssets');
 const linkDependency = require('./linkDependency');
 
-log.heading = 'rnpm-link';
-
 const dedupeAssets = assets => uniqBy(assets, asset => path.basename(asset));
 
 function linkAll(
@@ -25,8 +23,8 @@ function linkAll(
 ) {
   log.warn(
     'Running `react-native link` without package name is deprecated and will be removed ' +
-      'in next release. If you are using `react-native link` to link your project assets, ' +
-      ' let us know about your use case here: https://goo.gl/RKTeoc'
+      'in next release. If you use this command to link your project assets, ' +
+      'please let us know about your use case here: https://goo.gl/RKTeoc'
   );
 
   const projectAssets = getAssets(context.root);
diff --git a/packages/cli/src/link/linkAssets.js b/packages/cli/src/link/linkAssets.js
index 1e983f701..1d629392a 100644
--- a/packages/cli/src/link/linkAssets.js
+++ b/packages/cli/src/link/linkAssets.js
@@ -2,10 +2,8 @@
 
 import type { PlatformsT, ProjectConfigT } from '../core/types.flow';
 
-const log = require('npmlog');
 const { isEmpty } = require('lodash');
-
-log.heading = 'rnpm-link';
+const log = require('../util/logger');
 
 const linkAssets = (
   platforms: PlatformsT,
diff --git a/packages/cli/src/link/linkDependency.js b/packages/cli/src/link/linkDependency.js
index f43b0c99a..ef9489053 100644
--- a/packages/cli/src/link/linkDependency.js
+++ b/packages/cli/src/link/linkDependency.js
@@ -2,12 +2,10 @@
 
 import type { PlatformsT, ProjectConfigT } from '../core/types.flow';
 
-const log = require('npmlog');
 const chalk = require('chalk');
+const log = require('../util/logger');
 const pollParams = require('./pollParams');
 
-log.heading = 'rnpm-link';
-
 const linkDependency = async (
   platforms: PlatformsT,
   project: ProjectConfigT,
diff --git a/packages/cli/src/link/unlink.js b/packages/cli/src/link/unlink.js
index ddc8bde8e..519b4a7ba 100644
--- a/packages/cli/src/link/unlink.js
+++ b/packages/cli/src/link/unlink.js
@@ -9,9 +9,8 @@
 
 import type { ContextT } from '../core/types.flow';
 
-const log = require('npmlog');
-
 const { flatten, isEmpty, difference } = require('lodash');
+const log = require('../util/logger');
 const getProjectConfig = require('./getProjectConfig');
 const getDependencyConfig = require('./getDependencyConfig');
 const getProjectDependencies = require('./getProjectDependencies');
@@ -21,8 +20,6 @@ const promisify = require('./promisify');
 
 const getPlatforms = require('../core/getPlatforms');
 
-log.heading = 'rnpm-link';
-
 const unlinkDependency = (
   platforms,
   project,
@@ -88,8 +85,7 @@ function unlink(args: Array<string>, ctx: ContextT) {
     platforms = getPlatforms(ctx.root);
   } catch (err) {
     log.error(
-      'ERRPACKAGEJSON',
-      "No package found. Are you sure it's a React Native project?"
+      "No package.json found. Are you sure it's a React Native project?"
     );
     return Promise.reject(err);
   }
@@ -110,7 +106,7 @@ function unlink(args: Array<string>, ctx: ContextT) {
     otherDependencies = [...allDependencies];
     dependency = otherDependencies.splice(idx, 1)[0]; // eslint-disable-line prefer-destructuring
   } catch (err) {
-    log.warn('ERRINVALIDPROJ', err.message);
+    log.warn(err.message);
     return Promise.reject(err);
   }
 
@@ -162,7 +158,7 @@ function unlink(args: Array<string>, ctx: ContextT) {
     })
     .catch(err => {
       log.error(
-        `It seems something went wrong while unlinking. Error: ${err.message}`
+        `It seems something went wrong while unlinking. Error:\n${err.message}`
       );
       throw err;
     });