diff --git a/lib/config/cmd-list.js b/lib/config/cmd-list.js
index 629556d13f473..85e456a835805 100644
--- a/lib/config/cmd-list.js
+++ b/lib/config/cmd-list.js
@@ -28,11 +28,19 @@ const affordances = {
   verison: 'version',
   ic: 'ci',
   innit: 'init',
-  isntall: 'install',
+  // manually abbrev so that install-test doesn't make insta stop working
+  in: 'install',
+  ins: 'install',
+  inst: 'install',
+  insta: 'install',
+  instal: 'install',
+  isnt: 'install',
+  isnta: 'install',
+  isntal: 'install',
   'install-clean': 'ci',
   'isntall-clean': 'ci',
+  hlep: 'help',
   'dist-tags': 'dist-tag',
-  apihelp: 'help',
   upgrade: 'update',
   udpate: 'update',
   login: 'adduser',
@@ -95,7 +103,6 @@ const cmdList = [
   'org',
 
   'help',
-  'help-search',
   'ls',
   'll',
   'search',
@@ -124,7 +131,7 @@ const cmdList = [
   'exec'
 ]
 
-const plumbing = ['birthday']
+const plumbing = ['birthday', 'help-search']
 module.exports = {
   aliases: Object.assign({}, shorthands, affordances),
   shorthands,
diff --git a/tap-snapshots/test-lib-config-cmd-list.js-TAP.test.js b/tap-snapshots/test-lib-config-cmd-list.js-TAP.test.js
index 3a0c47d3c67b5..d7db532f402b8 100644
--- a/tap-snapshots/test-lib-config-cmd-list.js-TAP.test.js
+++ b/tap-snapshots/test-lib-config-cmd-list.js-TAP.test.js
@@ -10,16 +10,23 @@ Object {
   "affordances": Object {
     "add": "install",
     "add-user": "adduser",
-    "apihelp": "help",
     "author": "owner",
     "dist-tags": "dist-tag",
     "find": "search",
+    "hlep": "help",
     "home": "docs",
     "ic": "ci",
+    "in": "install",
     "info": "view",
     "innit": "init",
+    "ins": "install",
+    "inst": "install",
+    "insta": "install",
+    "instal": "install",
     "install-clean": "ci",
-    "isntall": "install",
+    "isnt": "install",
+    "isnta": "install",
+    "isntal": "install",
     "isntall-clean": "ci",
     "issues": "bugs",
     "la": "ll",
@@ -40,7 +47,6 @@ Object {
   "aliases": Object {
     "add": "install",
     "add-user": "adduser",
-    "apihelp": "help",
     "author": "owner",
     "c": "config",
     "cit": "install-ci-test",
@@ -50,13 +56,21 @@ Object {
     "ddp": "dedupe",
     "dist-tags": "dist-tag",
     "find": "search",
+    "hlep": "help",
     "home": "docs",
     "i": "install",
     "ic": "ci",
+    "in": "install",
     "info": "view",
     "innit": "init",
+    "ins": "install",
+    "inst": "install",
+    "insta": "install",
+    "instal": "install",
     "install-clean": "ci",
-    "isntall": "install",
+    "isnt": "install",
+    "isnta": "install",
+    "isntal": "install",
     "isntall-clean": "ci",
     "issues": "bugs",
     "it": "install-test",
@@ -125,7 +139,6 @@ Object {
     "fund",
     "org",
     "help",
-    "help-search",
     "ls",
     "ll",
     "search",
@@ -154,6 +167,7 @@ Object {
   ],
   "plumbing": Array [
     "birthday",
+    "help-search",
   ],
   "shorthands": Object {
     "c": "config",