diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1cc47783ba..6985bb7696 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,4 +78,3 @@ jobs:
       - run: echo done
         working-directory: /
 
-
diff --git a/packages/cli/test/acceptance/smoke.acceptance.test.ts b/packages/cli/test/acceptance/smoke.acceptance.test.ts
index 323fe422c2..f1ef430f74 100755
--- a/packages/cli/test/acceptance/smoke.acceptance.test.ts
+++ b/packages/cli/test/acceptance/smoke.acceptance.test.ts
@@ -6,6 +6,8 @@ import * as qq from 'qqjs'
 
 const globby = require('globby')
 
+const app = 'heroku-cli-ci-smoke-test-app'
+const appFlag = `-a=${app}`
 const bin = path.join(__dirname, '../../bin/run')
 
 function run(args = '') {
@@ -30,25 +32,32 @@ describe('@acceptance smoke tests', () => {
   })
 
   it('heroku apps:info', async () => {
-    const app = 'heroku-cli-ci-smoke-test-app'
-    const appFlag = `-a=${app}`
-    expect((await run(['info', appFlag].join(' '))).stdout).to.contain(app)
+    const {stdout} = await run(`info ${appFlag}`)
+    expect(stdout).to.contain(app)
   })
 
   it('heroku run', async () => {
-    const app = 'heroku-cli-ci-smoke-test-app'
-    const appFlag = `-a=${app}`
     const {stdout} = await run(['run', '--exit-code', appFlag, 'echo', 'it works!'].join(' '))
     expect(stdout).to.contain('it works!')
   })
 
   it('heroku access', async () => {
-    const app = 'heroku-cli-ci-smoke-test-app'
-    const appFlag = `-a=${app}`
-    const {stdout} = await run(['access', appFlag].join(' '))
+    const {stdout} = await run(`access ${appFlag}`)
     expect(stdout).to.contain('heroku-cli@salesforce.com')
   })
 
+  it('heroku pg:backups', async () => {
+    const {stdout} = await run(`pg:backups ${appFlag}`)
+    expect(stdout).to.match(/===.*Backups/)
+    expect(stdout).to.match(/===.*Restores/)
+    expect(stdout).to.match(/===.*Copies/)
+  })
+
+  it('heroku pipelines', async () => {
+    const {stdout} = await run('pipelines')
+    expect(stdout).to.match(/===.*My Pipelines/)
+  })
+
   // TODO: turn this test back on once the issue with listing plugins is fixed
   it.skip('asserts oclif plugins are in core', async () => {
     const cmd = await run('plugins --core')
diff --git a/packages/pg-v5/package.json b/packages/pg-v5/package.json
index fdfce8c653..ba0cd897f2 100644
--- a/packages/pg-v5/package.json
+++ b/packages/pg-v5/package.json
@@ -63,7 +63,7 @@
     "posttest": "yarn lint",
     "prepack": "oclif manifest",
     "release": "np",
-    "test": "cross-env TZ=utc nyc mocha",
+    "test": "cross-env TZ=utc nyc mocha --forbid-only \"test/**/*.unit.test.js\"",
     "version": "oclif readme && git add README.md"
   }
 }
diff --git a/packages/pg-v5/test/commands/backups/cancel.js b/packages/pg-v5/test/unit/commands/backups/cancel.unit.test.js
similarity index 92%
rename from packages/pg-v5/test/commands/backups/cancel.js
rename to packages/pg-v5/test/unit/commands/backups/cancel.unit.test.js
index 07084f3e44..5d457cef5e 100644
--- a/packages/pg-v5/test/commands/backups/cancel.js
+++ b/packages/pg-v5/test/unit/commands/backups/cancel.unit.test.js
@@ -4,7 +4,7 @@
 const cli = require('heroku-cli-util')
 const {expect} = require('chai')
 const nock = require('nock')
-const cmd = require('../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:cancel')
+const cmd = require('../../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:cancel')
 
 const shouldCancel = function (cmdRun) {
   let pg
diff --git a/packages/pg-v5/test/commands/backups/capture.js b/packages/pg-v5/test/unit/commands/backups/capture.unit.test.js
similarity index 99%
rename from packages/pg-v5/test/commands/backups/capture.js
rename to packages/pg-v5/test/unit/commands/backups/capture.unit.test.js
index 566cb74e37..8023e23791 100644
--- a/packages/pg-v5/test/commands/backups/capture.js
+++ b/packages/pg-v5/test/unit/commands/backups/capture.unit.test.js
@@ -7,7 +7,7 @@ const nock = require('nock')
 
 const addon = {id: 1, name: 'postgres-1', plan: {name: 'heroku-postgresql:standard-0'}, app: {name: 'myapp'}}
 
-const cmd = require('../../../commands/backups/capture')
+const cmd = require('../../../../commands/backups/capture')
 
 let captureText = () => {
   if (process.stderr.isTTY) {
diff --git a/packages/pg-v5/test/commands/backups/delete.js b/packages/pg-v5/test/unit/commands/backups/delete.unit.test.js
similarity index 88%
rename from packages/pg-v5/test/commands/backups/delete.js
rename to packages/pg-v5/test/unit/commands/backups/delete.unit.test.js
index 4c61439575..a9265b7767 100644
--- a/packages/pg-v5/test/commands/backups/delete.js
+++ b/packages/pg-v5/test/unit/commands/backups/delete.unit.test.js
@@ -4,7 +4,7 @@
 const cli = require('heroku-cli-util')
 const {expect} = require('chai')
 const nock = require('nock')
-const cmd = require('../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:delete')
+const cmd = require('../../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:delete')
 
 const shouldDelete = function (cmdRun) {
   let pg
diff --git a/packages/pg-v5/test/commands/backups/download.js b/packages/pg-v5/test/unit/commands/backups/download.unit.test.js
similarity index 92%
rename from packages/pg-v5/test/commands/backups/download.js
rename to packages/pg-v5/test/unit/commands/backups/download.unit.test.js
index 0233a5a46b..0c74d0a7ab 100644
--- a/packages/pg-v5/test/commands/backups/download.js
+++ b/packages/pg-v5/test/unit/commands/backups/download.unit.test.js
@@ -4,7 +4,7 @@
 const cli = require('heroku-cli-util')
 const {expect} = require('chai')
 const nock = require('nock')
-const cmd = require('../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:download')
+const cmd = require('../../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:download')
 const fs = require('fs')
 
 describe('pg:backups:download', () => {
diff --git a/packages/pg-v5/test/commands/backups/helpers.js b/packages/pg-v5/test/unit/commands/backups/helpers.js
similarity index 79%
rename from packages/pg-v5/test/commands/backups/helpers.js
rename to packages/pg-v5/test/unit/commands/backups/helpers.js
index 424933984d..87977c6660 100644
--- a/packages/pg-v5/test/commands/backups/helpers.js
+++ b/packages/pg-v5/test/unit/commands/backups/helpers.js
@@ -13,7 +13,7 @@ let cmdRun = function (name, cmd) {
 
     args = Object.assign(args, {args: varArgs})
 
-    const backupsCmd = require('../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups')
+    const backupsCmd = require('../../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups')
     return backupsCmd.run(args)
   }
 }
diff --git a/packages/pg-v5/test/commands/backups/index.js b/packages/pg-v5/test/unit/commands/backups/index.unit.test.js
similarity index 96%
rename from packages/pg-v5/test/commands/backups/index.js
rename to packages/pg-v5/test/unit/commands/backups/index.unit.test.js
index 6d076a9af6..7978350fe3 100644
--- a/packages/pg-v5/test/commands/backups/index.js
+++ b/packages/pg-v5/test/unit/commands/backups/index.unit.test.js
@@ -4,7 +4,7 @@
 const cli = require('heroku-cli-util')
 const {expect} = require('chai')
 const nock = require('nock')
-const cmd = require('../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups')
+const cmd = require('../../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups')
 
 describe('pg:backups', () => {
   let pg
@@ -190,7 +190,7 @@ c003  2016-10-08 00:42:54 +0000  Completed 2016-10-08 00:43:00 +0000  1.40KB  RE
 })
 
 describe('pg:backups', () => {
-  const infoCmd = require('../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:info')
+  const infoCmd = require('../../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:info')
 
   it('errors out when subcommand not found', () => {
     return expect(require('./helpers.js').dup('foobar', infoCmd)({})).to.be.rejectedWith('Unknown pg:backups command: foobar')
diff --git a/packages/pg-v5/test/commands/backups/info.js b/packages/pg-v5/test/unit/commands/backups/info.unit.test.js
similarity index 96%
rename from packages/pg-v5/test/commands/backups/info.js
rename to packages/pg-v5/test/unit/commands/backups/info.unit.test.js
index a1879b1c7d..a73f2dab64 100644
--- a/packages/pg-v5/test/commands/backups/info.js
+++ b/packages/pg-v5/test/unit/commands/backups/info.unit.test.js
@@ -4,7 +4,7 @@
 const cli = require('heroku-cli-util')
 const {expect} = require('chai')
 const nock = require('nock')
-const cmd = require('../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:info')
+const cmd = require('../../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:info')
 
 const shouldInfo = function (cmdRun) {
   let pg
diff --git a/packages/pg-v5/test/commands/backups/restore.js b/packages/pg-v5/test/unit/commands/backups/restore.unit.test.js
similarity index 99%
rename from packages/pg-v5/test/commands/backups/restore.js
rename to packages/pg-v5/test/unit/commands/backups/restore.unit.test.js
index 2647c90c75..604ff2be4f 100644
--- a/packages/pg-v5/test/commands/backups/restore.js
+++ b/packages/pg-v5/test/unit/commands/backups/restore.unit.test.js
@@ -7,7 +7,7 @@ const nock = require('nock')
 
 const addon = {id: 1, name: 'postgres-1', plan: {name: 'heroku-postgresql:standard-0'}, app: {name: 'myapp'}}
 
-const cmd = require('../../../commands/backups/restore')
+const cmd = require('../../../../commands/backups/restore')
 
 let restoringText = () => {
   return process.stderr.isTTY ? 'Restoring... pending\nRestoring... done\n' : 'Restoring... done\n'
diff --git a/packages/pg-v5/test/commands/backups/schedule.js b/packages/pg-v5/test/unit/commands/backups/schedule.unit.test.js
similarity index 95%
rename from packages/pg-v5/test/commands/backups/schedule.js
rename to packages/pg-v5/test/unit/commands/backups/schedule.unit.test.js
index 5c72145688..9f9d119a33 100644
--- a/packages/pg-v5/test/commands/backups/schedule.js
+++ b/packages/pg-v5/test/unit/commands/backups/schedule.unit.test.js
@@ -4,7 +4,7 @@
 const cli = require('heroku-cli-util')
 const {expect} = require('chai')
 const nock = require('nock')
-const cmd = require('../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:schedule')
+const cmd = require('../../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:schedule')
 
 const shouldSchedule = function (cmdRun) {
   let pg
diff --git a/packages/pg-v5/test/commands/backups/schedules.js b/packages/pg-v5/test/unit/commands/backups/schedules.unit.test.js
similarity index 94%
rename from packages/pg-v5/test/commands/backups/schedules.js
rename to packages/pg-v5/test/unit/commands/backups/schedules.unit.test.js
index 18e949bc14..13256a6ba1 100644
--- a/packages/pg-v5/test/commands/backups/schedules.js
+++ b/packages/pg-v5/test/unit/commands/backups/schedules.unit.test.js
@@ -4,7 +4,7 @@
 const cli = require('heroku-cli-util')
 const {expect} = require('chai')
 const nock = require('nock')
-const cmd = require('../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:schedules')
+const cmd = require('../../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:schedules')
 
 const shouldSchedules = function (cmdRun) {
   let api
diff --git a/packages/pg-v5/test/commands/backups/unschedule.js b/packages/pg-v5/test/unit/commands/backups/unschedule.unit.test.js
similarity index 93%
rename from packages/pg-v5/test/commands/backups/unschedule.js
rename to packages/pg-v5/test/unit/commands/backups/unschedule.unit.test.js
index 97050a9f33..dd998f2407 100644
--- a/packages/pg-v5/test/commands/backups/unschedule.js
+++ b/packages/pg-v5/test/unit/commands/backups/unschedule.unit.test.js
@@ -4,7 +4,7 @@
 const cli = require('heroku-cli-util')
 const {expect} = require('chai')
 const nock = require('nock')
-const cmd = require('../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:unschedule')
+const cmd = require('../../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:unschedule')
 
 const addon = {
   id: 1,
diff --git a/packages/pg-v5/test/commands/backups/url.js b/packages/pg-v5/test/unit/commands/backups/url.unit.test.js
similarity index 92%
rename from packages/pg-v5/test/commands/backups/url.js
rename to packages/pg-v5/test/unit/commands/backups/url.unit.test.js
index d8735f2706..26ea6bfefc 100644
--- a/packages/pg-v5/test/commands/backups/url.js
+++ b/packages/pg-v5/test/unit/commands/backups/url.unit.test.js
@@ -4,7 +4,7 @@
 const cli = require('heroku-cli-util')
 const {expect} = require('chai')
 const nock = require('nock')
-const cmd = require('../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:url')
+const cmd = require('../../../..').commands.find(c => c.topic === 'pg' && c.command === 'backups:url')
 
 const shouldUrl = function (cmdRun) {
   let pg
diff --git a/packages/pg-v5/test/commands/connection_pooling.js b/packages/pg-v5/test/unit/commands/connection_pooling.unit.test.js
similarity index 97%
rename from packages/pg-v5/test/commands/connection_pooling.js
rename to packages/pg-v5/test/unit/commands/connection_pooling.unit.test.js
index 3c6e4da0ae..db71826025 100644
--- a/packages/pg-v5/test/commands/connection_pooling.js
+++ b/packages/pg-v5/test/unit/commands/connection_pooling.unit.test.js
@@ -27,7 +27,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../commands/connection_pooling', {
+const cmd = proxyquire('../../../commands/connection_pooling', {
   '../lib/fetcher': fetcher,
 })
 
diff --git a/packages/pg-v5/test/commands/copy.js b/packages/pg-v5/test/unit/commands/copy.unit.test.js
similarity index 98%
rename from packages/pg-v5/test/commands/copy.js
rename to packages/pg-v5/test/unit/commands/copy.unit.test.js
index 348bfad836..e9c69db9f5 100644
--- a/packages/pg-v5/test/commands/copy.js
+++ b/packages/pg-v5/test/unit/commands/copy.unit.test.js
@@ -4,9 +4,9 @@
 const cli = require('heroku-cli-util')
 const {expect} = require('chai')
 const nock = require('nock')
-const unwrap = require('../unwrap')
+const unwrap = require('../../unwrap')
 
-const cmd = require('../..').commands.find(c => c.topic === 'pg' && c.command === 'copy')
+const cmd = require('../../..').commands.find(c => c.topic === 'pg' && c.command === 'copy')
 
 const addon = {
   id: 1,
diff --git a/packages/pg-v5/test/commands/credentials.js b/packages/pg-v5/test/unit/commands/credentials.unit.test.js
similarity index 99%
rename from packages/pg-v5/test/commands/credentials.js
rename to packages/pg-v5/test/unit/commands/credentials.unit.test.js
index 26d1fde2bb..a166bb3b95 100644
--- a/packages/pg-v5/test/commands/credentials.js
+++ b/packages/pg-v5/test/unit/commands/credentials.unit.test.js
@@ -27,7 +27,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../commands/credentials', {
+const cmd = proxyquire('../../../commands/credentials', {
   '../lib/fetcher': fetcher,
 })
 
diff --git a/packages/pg-v5/test/commands/credentials/create.js b/packages/pg-v5/test/unit/commands/credentials/create.unit.test.js
similarity index 93%
rename from packages/pg-v5/test/commands/credentials/create.js
rename to packages/pg-v5/test/unit/commands/credentials/create.unit.test.js
index a06adcaab9..03aed0a1ba 100644
--- a/packages/pg-v5/test/commands/credentials/create.js
+++ b/packages/pg-v5/test/unit/commands/credentials/create.unit.test.js
@@ -26,7 +26,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../../commands/credentials/create', {
+const cmd = proxyquire('../../../../commands/credentials/create', {
   '../../lib/fetcher': fetcher,
 })
 
@@ -68,7 +68,7 @@ Please define the new grants for the credential within Postgres: heroku pg:psql
       }
     }
 
-    const cmd = proxyquire('../../../commands/credentials/create', {
+    const cmd = proxyquire('../../../../commands/credentials/create', {
       '../../lib/fetcher': fetcher,
     })
 
diff --git a/packages/pg-v5/test/commands/credentials/destroy.js b/packages/pg-v5/test/unit/commands/credentials/destroy.unit.test.js
similarity index 96%
rename from packages/pg-v5/test/commands/credentials/destroy.js
rename to packages/pg-v5/test/unit/commands/credentials/destroy.unit.test.js
index aaaa8e5590..ac5be5d4af 100644
--- a/packages/pg-v5/test/commands/credentials/destroy.js
+++ b/packages/pg-v5/test/unit/commands/credentials/destroy.unit.test.js
@@ -26,7 +26,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../../commands/credentials/destroy', {
+const cmd = proxyquire('../../../../commands/credentials/destroy', {
   '../../lib/fetcher': fetcher,
 })
 
@@ -75,7 +75,7 @@ Database objects owned by credname will be assigned to the default credential.
       }
     }
 
-    const cmd = proxyquire('../../../commands/credentials/destroy', {
+    const cmd = proxyquire('../../../../commands/credentials/destroy', {
       '../../lib/fetcher': fetcher,
     })
 
diff --git a/packages/pg-v5/test/commands/credentials/repair_default.js b/packages/pg-v5/test/unit/commands/credentials/repair_default.unit.test.js
similarity index 91%
rename from packages/pg-v5/test/commands/credentials/repair_default.js
rename to packages/pg-v5/test/unit/commands/credentials/repair_default.unit.test.js
index ea06af7d69..583e5cfcea 100644
--- a/packages/pg-v5/test/commands/credentials/repair_default.js
+++ b/packages/pg-v5/test/unit/commands/credentials/repair_default.unit.test.js
@@ -26,7 +26,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../../commands/credentials/repair_default', {
+const cmd = proxyquire('../../../../commands/credentials/repair_default', {
   '../../lib/fetcher': fetcher,
 })
 
@@ -65,7 +65,7 @@ describe('pg:credentials:repair-default', () => {
       }
     }
 
-    const cmd = proxyquire('../../../commands/credentials/repair_default', {
+    const cmd = proxyquire('../../../../commands/credentials/repair_default', {
       '../../lib/fetcher': fetcher,
     })
 
diff --git a/packages/pg-v5/test/commands/credentials/rotate.js b/packages/pg-v5/test/unit/commands/credentials/rotate.unit.test.js
similarity index 96%
rename from packages/pg-v5/test/commands/credentials/rotate.js
rename to packages/pg-v5/test/unit/commands/credentials/rotate.unit.test.js
index 494d83ac17..6d8b474fa7 100644
--- a/packages/pg-v5/test/commands/credentials/rotate.js
+++ b/packages/pg-v5/test/unit/commands/credentials/rotate.unit.test.js
@@ -42,7 +42,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../../commands/credentials/rotate', {
+const cmd = proxyquire('../../../../commands/credentials/rotate', {
   '../../lib/fetcher': fetcher,
 })
 
@@ -118,7 +118,7 @@ describe('pg:credentials:rotate', () => {
       }
     }
 
-    const cmd = proxyquire('../../../commands/credentials/rotate', {
+    const cmd = proxyquire('../../../../commands/credentials/rotate', {
       '../../lib/fetcher': fetcher,
     })
 
@@ -139,7 +139,7 @@ describe('pg:credentials:rotate', () => {
       }
     }
 
-    const cmd = proxyquire('../../../commands/credentials/rotate', {
+    const cmd = proxyquire('../../../../commands/credentials/rotate', {
       '../../lib/fetcher': fetcher,
     })
 
@@ -162,7 +162,7 @@ describe('pg:credentials:rotate', () => {
       }
     }
 
-    const cmd = proxyquire('../../../commands/credentials/rotate', {
+    const cmd = proxyquire('../../../../commands/credentials/rotate', {
       '../../lib/fetcher': fetcher,
     })
 
diff --git a/packages/pg-v5/test/commands/credentials/url.js b/packages/pg-v5/test/unit/commands/credentials/url.unit.test.js
similarity index 94%
rename from packages/pg-v5/test/commands/credentials/url.js
rename to packages/pg-v5/test/unit/commands/credentials/url.unit.test.js
index c7309f207d..2c7a858f52 100644
--- a/packages/pg-v5/test/commands/credentials/url.js
+++ b/packages/pg-v5/test/unit/commands/credentials/url.unit.test.js
@@ -26,7 +26,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../../commands/credentials/url', {
+const cmd = proxyquire('../../../../commands/credentials/url', {
   '../../lib/fetcher': fetcher,
 })
 
@@ -91,7 +91,7 @@ Connection URL:
       }
     }
 
-    const cmd = proxyquire('../../../commands/credentials/url', {
+    const cmd = proxyquire('../../../../commands/credentials/url', {
       '../../lib/fetcher': fetcher,
     })
 
@@ -112,7 +112,7 @@ Connection URL:
       }
     }
 
-    const cmd = proxyquire('../../../commands/credentials/url', {
+    const cmd = proxyquire('../../../../commands/credentials/url', {
       '../../lib/fetcher': fetcher,
     })
 
diff --git a/packages/pg-v5/test/commands/diagnose.js b/packages/pg-v5/test/unit/commands/diagnose.unit.test.js
similarity index 99%
rename from packages/pg-v5/test/commands/diagnose.js
rename to packages/pg-v5/test/unit/commands/diagnose.unit.test.js
index 70ee0ef42c..7dccdccfc6 100644
--- a/packages/pg-v5/test/commands/diagnose.js
+++ b/packages/pg-v5/test/unit/commands/diagnose.unit.test.js
@@ -32,7 +32,7 @@ describe('pg:diagnose', () => {
     }
   }
 
-  const cmd = proxyquire('../../commands/diagnose', {
+  const cmd = proxyquire('../../../commands/diagnose', {
     '../lib/fetcher': fetcher,
   })
 
diff --git a/packages/pg-v5/test/commands/info.js b/packages/pg-v5/test/unit/commands/info.unit.test.js
similarity index 98%
rename from packages/pg-v5/test/commands/info.js
rename to packages/pg-v5/test/unit/commands/info.unit.test.js
index b5a9a269fe..0860d562a2 100644
--- a/packages/pg-v5/test/commands/info.js
+++ b/packages/pg-v5/test/unit/commands/info.unit.test.js
@@ -5,7 +5,7 @@ const cli = require('heroku-cli-util')
 const {expect} = require('chai')
 const nock = require('nock')
 const proxyquire = require('proxyquire')
-const unwrap = require('../unwrap')
+const unwrap = require('../../unwrap')
 
 let all = []
 let addon
@@ -16,7 +16,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../commands/info', {
+const cmd = proxyquire('../../../commands/info', {
   '../lib/fetcher': fetcher,
 })[0]
 
diff --git a/packages/pg-v5/test/commands/kill.js b/packages/pg-v5/test/unit/commands/kill.unit.test.js
similarity index 95%
rename from packages/pg-v5/test/commands/kill.js
rename to packages/pg-v5/test/unit/commands/kill.unit.test.js
index da028c9418..506a25bd2e 100644
--- a/packages/pg-v5/test/commands/kill.js
+++ b/packages/pg-v5/test/unit/commands/kill.unit.test.js
@@ -20,7 +20,7 @@ const psql = {
   },
 }
 
-const cmd = proxyquire('../../commands/kill', {
+const cmd = proxyquire('../../../commands/kill', {
   '../lib/fetcher': fetcher,
   '../lib/psql': psql,
 })
diff --git a/packages/pg-v5/test/commands/killall.js b/packages/pg-v5/test/unit/commands/killall.unit.test.js
similarity index 94%
rename from packages/pg-v5/test/commands/killall.js
rename to packages/pg-v5/test/unit/commands/killall.unit.test.js
index a26e760b81..f1e60cc55f 100644
--- a/packages/pg-v5/test/commands/killall.js
+++ b/packages/pg-v5/test/unit/commands/killall.unit.test.js
@@ -13,7 +13,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../commands/killall', {
+const cmd = proxyquire('../../../commands/killall', {
   '../lib/fetcher': fetcher,
 })
 
diff --git a/packages/pg-v5/test/commands/links/create.js b/packages/pg-v5/test/unit/commands/links/create.unit.test.js
similarity index 94%
rename from packages/pg-v5/test/commands/links/create.js
rename to packages/pg-v5/test/unit/commands/links/create.unit.test.js
index 961f6a68ad..75eba866e3 100644
--- a/packages/pg-v5/test/commands/links/create.js
+++ b/packages/pg-v5/test/unit/commands/links/create.unit.test.js
@@ -12,7 +12,7 @@ const addon = {
   plan: {name: 'heroku-postgresql:standard-0'},
 }
 
-const cmd = proxyquire('../../../commands/links/create', {
+const cmd = proxyquire('../../../../commands/links/create', {
   '@heroku-cli/plugin-addons': {
     resolve: {addon: () => addon},
   },
diff --git a/packages/pg-v5/test/commands/links/destroy.js b/packages/pg-v5/test/unit/commands/links/destroy.unit.test.js
similarity index 94%
rename from packages/pg-v5/test/commands/links/destroy.js
rename to packages/pg-v5/test/unit/commands/links/destroy.unit.test.js
index 4eb89f0953..ab25a51c1c 100644
--- a/packages/pg-v5/test/commands/links/destroy.js
+++ b/packages/pg-v5/test/unit/commands/links/destroy.unit.test.js
@@ -12,7 +12,7 @@ const addon = {
   plan: {name: 'heroku-postgresql:standard-0'},
 }
 
-const cmd = proxyquire('../../../commands/links/destroy', {
+const cmd = proxyquire('../../../../commands/links/destroy', {
   '@heroku-cli/plugin-addons': {
     resolve: {addon: () => addon},
   },
diff --git a/packages/pg-v5/test/commands/links/index.js b/packages/pg-v5/test/unit/commands/links/index.unit.test.js
similarity index 95%
rename from packages/pg-v5/test/commands/links/index.js
rename to packages/pg-v5/test/unit/commands/links/index.unit.test.js
index c6a8ccf64e..ae9c477679 100644
--- a/packages/pg-v5/test/commands/links/index.js
+++ b/packages/pg-v5/test/unit/commands/links/index.unit.test.js
@@ -18,7 +18,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../../commands/links', {
+const cmd = proxyquire('../../../../commands/links', {
   '../../lib/fetcher': fetcher,
 })
 
diff --git a/packages/pg-v5/test/commands/maintenance/index.js b/packages/pg-v5/test/unit/commands/maintenance/index.unit.test.js
similarity index 93%
rename from packages/pg-v5/test/commands/maintenance/index.js
rename to packages/pg-v5/test/unit/commands/maintenance/index.unit.test.js
index d23d0c54df..0f72b162ce 100644
--- a/packages/pg-v5/test/commands/maintenance/index.js
+++ b/packages/pg-v5/test/unit/commands/maintenance/index.unit.test.js
@@ -17,7 +17,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../../commands/maintenance', {
+const cmd = proxyquire('../../../../commands/maintenance', {
   '../../lib/fetcher': fetcher,
 })
 
diff --git a/packages/pg-v5/test/commands/maintenance/run.js b/packages/pg-v5/test/unit/commands/maintenance/run.unit.test.js
similarity index 94%
rename from packages/pg-v5/test/commands/maintenance/run.js
rename to packages/pg-v5/test/unit/commands/maintenance/run.unit.test.js
index a2e2662891..fe9076c16c 100644
--- a/packages/pg-v5/test/commands/maintenance/run.js
+++ b/packages/pg-v5/test/unit/commands/maintenance/run.unit.test.js
@@ -17,7 +17,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../../commands/maintenance/run', {
+const cmd = proxyquire('../../../../commands/maintenance/run', {
   '../../lib/fetcher': fetcher,
 })
 
diff --git a/packages/pg-v5/test/commands/maintenance/window.js b/packages/pg-v5/test/unit/commands/maintenance/window.unit.test.js
similarity index 93%
rename from packages/pg-v5/test/commands/maintenance/window.js
rename to packages/pg-v5/test/unit/commands/maintenance/window.unit.test.js
index 308842bacb..1c9ef44d9a 100644
--- a/packages/pg-v5/test/commands/maintenance/window.js
+++ b/packages/pg-v5/test/unit/commands/maintenance/window.unit.test.js
@@ -17,7 +17,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../../commands/maintenance/window', {
+const cmd = proxyquire('../../../../commands/maintenance/window', {
   '../../lib/fetcher': fetcher,
 })
 
diff --git a/packages/pg-v5/test/commands/outliers.js b/packages/pg-v5/test/unit/commands/outliers.unit.test.js
similarity index 97%
rename from packages/pg-v5/test/commands/outliers.js
rename to packages/pg-v5/test/unit/commands/outliers.unit.test.js
index 0fa4679e2a..e86b00265a 100644
--- a/packages/pg-v5/test/commands/outliers.js
+++ b/packages/pg-v5/test/unit/commands/outliers.unit.test.js
@@ -28,7 +28,7 @@ const psql = {
   },
 }
 
-const cmd = proxyquire('../../commands/outliers', {
+const cmd = proxyquire('../../../commands/outliers', {
   '../lib/fetcher': fetcher,
   '../lib/psql': psql,
 })
diff --git a/packages/pg-v5/test/commands/promote.js b/packages/pg-v5/test/unit/commands/promote.unit.test.js
similarity index 98%
rename from packages/pg-v5/test/commands/promote.js
rename to packages/pg-v5/test/unit/commands/promote.unit.test.js
index 668fbe77ba..2003f8a65b 100644
--- a/packages/pg-v5/test/commands/promote.js
+++ b/packages/pg-v5/test/unit/commands/promote.unit.test.js
@@ -30,7 +30,7 @@ describe('pg:promote when argument is database', () => {
     return 'https://postgres-api.heroku.com'
   }
 
-  const cmd = proxyquire('../../commands/promote', {
+  const cmd = proxyquire('../../../commands/promote', {
     '../lib/fetcher': fetcher,
     '../lib/host': host,
   })
@@ -204,7 +204,7 @@ describe('pg:promote when argument is a credential attachment', () => {
     return 'https://postgres-api.heroku.com'
   }
 
-  const cmd = proxyquire('../../commands/promote', {
+  const cmd = proxyquire('../../../commands/promote', {
     '../lib/fetcher': fetcher,
     '../lib/host': host,
   })
@@ -351,7 +351,7 @@ describe('pg:promote when release phase is present', () => {
     return 'https://postgres-api.heroku.com'
   }
 
-  const cmd = proxyquire('../../commands/promote', {
+  const cmd = proxyquire('../../../commands/promote', {
     '../lib/host': host,
   })
 
@@ -472,7 +472,7 @@ describe('pg:promote when database is not available or force flag is present', (
     return 'https://postgres-api.heroku.com'
   }
 
-  const cmd = proxyquire('../../commands/promote', {
+  const cmd = proxyquire('../../../commands/promote', {
     '../lib/fetcher': fetcher,
     '../lib/host': host,
   })
@@ -570,7 +570,7 @@ describe('pg:promote when promoted database is a follower', () => {
     return 'https://postgres-api.heroku.com'
   }
 
-  const cmd = proxyquire('../../commands/promote', {
+  const cmd = proxyquire('../../../commands/promote', {
     '../lib/fetcher': fetcher,
     '../lib/host': host,
   })
diff --git a/packages/pg-v5/test/commands/ps.js b/packages/pg-v5/test/unit/commands/ps.unit.test.js
similarity index 97%
rename from packages/pg-v5/test/commands/ps.js
rename to packages/pg-v5/test/unit/commands/ps.unit.test.js
index 33c91011b2..db0e2bbbec 100644
--- a/packages/pg-v5/test/commands/ps.js
+++ b/packages/pg-v5/test/unit/commands/ps.unit.test.js
@@ -29,7 +29,7 @@ const psql = {
   },
 }
 
-const cmd = proxyquire('../../commands/ps', {
+const cmd = proxyquire('../../../commands/ps', {
   '../lib/fetcher': fetcher,
   '../lib/psql': psql,
 })
diff --git a/packages/pg-v5/test/commands/psql.js b/packages/pg-v5/test/unit/commands/psql.unit.test.js
similarity index 89%
rename from packages/pg-v5/test/commands/psql.js
rename to packages/pg-v5/test/unit/commands/psql.unit.test.js
index d93283163a..970678a837 100644
--- a/packages/pg-v5/test/commands/psql.js
+++ b/packages/pg-v5/test/unit/commands/psql.unit.test.js
@@ -24,7 +24,7 @@ const db = {
 const fetcher = () => ({
   database: () => db,
 })
-const cmd = proxyquire('../../commands/psql', {
+const cmd = proxyquire('../../../commands/psql', {
   '../lib/fetcher': fetcher,
 })[0]
 
@@ -34,7 +34,7 @@ describe('psql', () => {
   })
 
   it('runs psql', () => {
-    let psql = require('../../lib/psql')
+    let psql = require('../../../lib/psql')
     sinon.stub(psql, 'exec').returns(Promise.resolve(''))
     return cmd.run({args: {}, flags: {command: 'SELECT 1'}})
       .then(() => expect(cli.stdout).to.equal(''))
@@ -43,7 +43,7 @@ describe('psql', () => {
   })
 
   it('runs psql with file', () => {
-    let psql = require('../../lib/psql')
+    let psql = require('../../../lib/psql')
     sinon.stub(psql, 'execFile').returns(Promise.resolve(''))
     return cmd.run({args: {}, flags: {file: 'test.sql'}})
       .then(() => expect(cli.stdout).to.equal(''))
diff --git a/packages/pg-v5/test/commands/pull.js b/packages/pg-v5/test/unit/commands/pull.unit.test.js
similarity index 97%
rename from packages/pg-v5/test/commands/pull.js
rename to packages/pg-v5/test/unit/commands/pull.unit.test.js
index f8fb800a17..e77a507705 100644
--- a/packages/pg-v5/test/commands/pull.js
+++ b/packages/pg-v5/test/unit/commands/pull.unit.test.js
@@ -47,16 +47,16 @@ describe('pg', () => {
 
     tunnelStub = sinon.stub().callsArg(1)
 
-    bastion = proxyquire('../../lib/bastion', {
+    bastion = proxyquire('../../../lib/bastion', {
       'tunnel-ssh': tunnelStub,
     })
 
-    push = proxyquire('../../commands/pull', {
+    push = proxyquire('../../../commands/pull', {
       '../lib/fetcher': fetcher,
       '../lib/bastion': bastion,
     })[0]
 
-    pull = proxyquire('../../commands/pull', {
+    pull = proxyquire('../../../commands/pull', {
       '../lib/fetcher': fetcher,
       '../lib/bastion': bastion,
     })[1]
@@ -90,7 +90,7 @@ describe('pg', () => {
       shell: true,
     }
 
-    const psql = require('../../lib/psql')
+    const psql = require('../../../lib/psql')
     const childProcess = require('child_process')
 
     let spawnStub
@@ -267,7 +267,7 @@ describe('pg', () => {
     }
 
     const childProcess = require('child_process')
-    const psql = require('../../lib/psql')
+    const psql = require('../../../lib/psql')
 
     let createDbStub
     let spawnStub
diff --git a/packages/pg-v5/test/commands/repoint.js b/packages/pg-v5/test/unit/commands/repoint.unit.test.js
similarity index 97%
rename from packages/pg-v5/test/commands/repoint.js
rename to packages/pg-v5/test/unit/commands/repoint.unit.test.js
index f5dc86bbcb..98a56bc2ae 100644
--- a/packages/pg-v5/test/commands/repoint.js
+++ b/packages/pg-v5/test/unit/commands/repoint.unit.test.js
@@ -13,7 +13,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../commands/repoint', {
+const cmd = proxyquire('../../../commands/repoint', {
   '../lib/fetcher': fetcher,
 })
 
diff --git a/packages/pg-v5/test/commands/reset.js b/packages/pg-v5/test/unit/commands/reset.unit.test.js
similarity index 96%
rename from packages/pg-v5/test/commands/reset.js
rename to packages/pg-v5/test/unit/commands/reset.unit.test.js
index 9c58a39ba9..20b22ab67a 100644
--- a/packages/pg-v5/test/commands/reset.js
+++ b/packages/pg-v5/test/unit/commands/reset.unit.test.js
@@ -17,7 +17,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../commands/reset', {
+const cmd = proxyquire('../../../commands/reset', {
   '../lib/fetcher': fetcher,
 })
 
diff --git a/packages/pg-v5/test/commands/settings/index.js b/packages/pg-v5/test/unit/commands/settings/index.unit.test.js
similarity index 94%
rename from packages/pg-v5/test/commands/settings/index.js
rename to packages/pg-v5/test/unit/commands/settings/index.unit.test.js
index 0278e858b9..86f7d8e9a4 100644
--- a/packages/pg-v5/test/commands/settings/index.js
+++ b/packages/pg-v5/test/unit/commands/settings/index.unit.test.js
@@ -17,7 +17,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../../commands/settings', {
+const cmd = proxyquire('../../../../commands/settings', {
   '../../lib/fetcher': fetcher,
 })
 
diff --git a/packages/pg-v5/test/commands/unfollow.js b/packages/pg-v5/test/unit/commands/unfollow.unit.test.js
similarity index 95%
rename from packages/pg-v5/test/commands/unfollow.js
rename to packages/pg-v5/test/unit/commands/unfollow.unit.test.js
index c34149f8fd..ab67c11784 100644
--- a/packages/pg-v5/test/commands/unfollow.js
+++ b/packages/pg-v5/test/unit/commands/unfollow.unit.test.js
@@ -17,7 +17,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../commands/unfollow', {
+const cmd = proxyquire('../../../commands/unfollow', {
   '../lib/fetcher': fetcher,
 })
 
diff --git a/packages/pg-v5/test/commands/upgrade.js b/packages/pg-v5/test/unit/commands/upgrade.unit.test.js
similarity index 97%
rename from packages/pg-v5/test/commands/upgrade.js
rename to packages/pg-v5/test/unit/commands/upgrade.unit.test.js
index 7f4f359dca..ed4e2b3794 100644
--- a/packages/pg-v5/test/commands/upgrade.js
+++ b/packages/pg-v5/test/unit/commands/upgrade.unit.test.js
@@ -13,7 +13,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../commands/upgrade', {
+const cmd = proxyquire('../../../commands/upgrade', {
   '../lib/fetcher': fetcher,
 })
 
diff --git a/packages/pg-v5/test/commands/wait.js b/packages/pg-v5/test/unit/commands/wait.unit.test.js
similarity index 95%
rename from packages/pg-v5/test/commands/wait.js
rename to packages/pg-v5/test/unit/commands/wait.unit.test.js
index e4ac8010d4..7046a0ebb5 100644
--- a/packages/pg-v5/test/commands/wait.js
+++ b/packages/pg-v5/test/unit/commands/wait.unit.test.js
@@ -5,7 +5,7 @@ const cli = require('heroku-cli-util')
 const {expect} = require('chai')
 const nock = require('nock')
 const proxyquire = require('proxyquire')
-const unwrap = require('../unwrap')
+const unwrap = require('../../unwrap')
 
 const all = [
   {id: 1, name: 'postgres-1', plan: {name: 'heroku-postgresql:hobby-dev'}},
@@ -18,7 +18,7 @@ const fetcher = () => {
   }
 }
 
-const cmd = proxyquire('../../commands/wait', {
+const cmd = proxyquire('../../../commands/wait', {
   '../lib/fetcher': fetcher,
 })
 
diff --git a/packages/pg-v5/test/lib/config.js b/packages/pg-v5/test/unit/lib/config.unit.test.js
similarity index 95%
rename from packages/pg-v5/test/lib/config.js
rename to packages/pg-v5/test/unit/lib/config.unit.test.js
index 9f8c8ff375..f9da7c5bdb 100644
--- a/packages/pg-v5/test/lib/config.js
+++ b/packages/pg-v5/test/unit/lib/config.unit.test.js
@@ -2,7 +2,7 @@
 /* global beforeEach afterEach */
 
 const nock = require('nock')
-const getConfig = require('../../lib/config')
+const getConfig = require('../../../lib/config')
 const {expect} = require('chai')
 const Heroku = require('heroku-client')
 
diff --git a/packages/pg-v5/test/lib/fetcher.js b/packages/pg-v5/test/unit/lib/fetcher.unit.test.js
similarity index 98%
rename from packages/pg-v5/test/lib/fetcher.js
rename to packages/pg-v5/test/unit/lib/fetcher.unit.test.js
index fe3bfb97e3..c6e1098acb 100644
--- a/packages/pg-v5/test/lib/fetcher.js
+++ b/packages/pg-v5/test/unit/lib/fetcher.unit.test.js
@@ -5,14 +5,14 @@ const nock = require('nock')
 const {expect} = require('chai')
 const proxyquire = require('proxyquire')
 const resolver = {}
-const fetcher = proxyquire('../../lib/fetcher', {'@heroku-cli/plugin-addons': {resolve: resolver}})
+const fetcher = proxyquire('../../../lib/fetcher', {'@heroku-cli/plugin-addons': {resolve: resolver}})
 const Heroku = require('heroku-client')
 const sinon = require('sinon')
 const url = require('url')
-const util = require('../../lib/util')
+const util = require('../../../lib/util')
 
 beforeEach(function () {
-  const getConfig = require('../../lib/config')
+  const getConfig = require('../../../lib/config')
   getConfig.clear()
 })
 
diff --git a/packages/pg-v5/test/lib/host.js b/packages/pg-v5/test/unit/lib/host.unit.test.js
similarity index 97%
rename from packages/pg-v5/test/lib/host.js
rename to packages/pg-v5/test/unit/lib/host.unit.test.js
index 29ddc5b645..adf06de3b2 100644
--- a/packages/pg-v5/test/lib/host.js
+++ b/packages/pg-v5/test/unit/lib/host.unit.test.js
@@ -2,7 +2,7 @@
 /* global context beforeEach afterEach */
 
 const {expect} = require('chai')
-let host = require('../../lib/host')
+let host = require('../../../lib/host')
 
 describe('host', () => {
   it('shows dev host', () => {
diff --git a/packages/pg-v5/test/lib/psql.js b/packages/pg-v5/test/unit/lib/psql.unit.test.js
similarity index 99%
rename from packages/pg-v5/test/lib/psql.js
rename to packages/pg-v5/test/unit/lib/psql.unit.test.js
index 2c18ec9931..a132286a7b 100644
--- a/packages/pg-v5/test/lib/psql.js
+++ b/packages/pg-v5/test/unit/lib/psql.unit.test.js
@@ -15,7 +15,7 @@ const tmp = require('tmp')
 const sinon = require('sinon')
 const {expect} = require('chai')
 
-const unwrap = require('../unwrap')
+const unwrap = require('../../unwrap')
 
 const db = {
   user: 'jeff',
@@ -67,10 +67,10 @@ describe('psql', () => {
       callback(null, fakeTunnel)
     })
     mockSpawn = createSpawnMocker(sandbox)
-    bastion = proxyquire('../../lib/bastion', {
+    bastion = proxyquire('../../../lib/bastion', {
       'tunnel-ssh': tunnelStub,
     })
-    psql = proxyquire('../../lib/psql', {
+    psql = proxyquire('../../../lib/psql', {
       './bastion': bastion,
     })
     fakePsqlProcess = new FakeChildProcess()
diff --git a/packages/pg-v5/test/lib/setter.js b/packages/pg-v5/test/unit/lib/setter.unit.test.js
similarity index 98%
rename from packages/pg-v5/test/lib/setter.js
rename to packages/pg-v5/test/unit/lib/setter.unit.test.js
index edcbf3a90f..6b52bb9bc1 100644
--- a/packages/pg-v5/test/lib/setter.js
+++ b/packages/pg-v5/test/unit/lib/setter.unit.test.js
@@ -17,7 +17,7 @@ const fetcher = () => {
   }
 }
 
-const setter = proxyquire('../../lib/setter', {
+const setter = proxyquire('../../../lib/setter', {
   './fetcher': fetcher,
 })
 
diff --git a/packages/pg-v5/test/lib/util.js b/packages/pg-v5/test/unit/lib/util.unit.test.js
similarity index 97%
rename from packages/pg-v5/test/lib/util.js
rename to packages/pg-v5/test/unit/lib/util.unit.test.js
index 85cb2d2156..35292a866c 100644
--- a/packages/pg-v5/test/lib/util.js
+++ b/packages/pg-v5/test/unit/lib/util.unit.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const {expect} = require('chai')
-const util = require('../../lib/util')
+const util = require('../../../lib/util')
 
 describe('util', () => {
   describe('parsePostgresConnectionString', () => {
diff --git a/packages/pg-v5/test/needs_app.js b/packages/pg-v5/test/unit/needs_app.unit.test.js
similarity index 64%
rename from packages/pg-v5/test/needs_app.js
rename to packages/pg-v5/test/unit/needs_app.unit.test.js
index a537fa22d7..f5f3b6d992 100644
--- a/packages/pg-v5/test/needs_app.js
+++ b/packages/pg-v5/test/unit/needs_app.unit.test.js
@@ -4,7 +4,7 @@ const {expect} = require('chai')
 
 describe('all commands', () => {
   it('should needsApp', () => {
-    const missingNeedsApp = require('..').commands.filter(command => !command.needsApp)
+    const missingNeedsApp = require('../..').commands.filter(command => !command.needsApp)
     expect(missingNeedsApp).to.deep.equal([])
   })
 })
diff --git a/packages/pipelines/package.json b/packages/pipelines/package.json
index 8e3cf112f3..aa860c5176 100644
--- a/packages/pipelines/package.json
+++ b/packages/pipelines/package.json
@@ -72,7 +72,7 @@
     "postpack": "rm -f oclif.manifest.json",
     "prepack": "rm -rf lib && tsc -b && oclif manifest",
     "pretest": "tsc -p test --noEmit",
-    "test": "nyc --extension .ts mocha \"test/**/*.test.ts\"",
+    "test": "nyc --extension .ts mocha --forbid-only \"test/**/*.unit.test.ts\"",
     "posttest": "yarn lint",
     "version": "oclif readme && git add README.md"
   }
diff --git a/packages/pipelines/test/commands/disable.test.ts b/packages/pipelines/test/unit/commands/disable.unit.test.ts
similarity index 100%
rename from packages/pipelines/test/commands/disable.test.ts
rename to packages/pipelines/test/unit/commands/disable.unit.test.ts
diff --git a/packages/pipelines/test/commands/enable.test.ts b/packages/pipelines/test/unit/commands/enable.unit.test.ts
similarity index 100%
rename from packages/pipelines/test/commands/enable.test.ts
rename to packages/pipelines/test/unit/commands/enable.unit.test.ts
diff --git a/packages/pipelines/test/commands/pipelines/add.test.ts b/packages/pipelines/test/unit/commands/pipelines/add.unit.test.ts
similarity index 100%
rename from packages/pipelines/test/commands/pipelines/add.test.ts
rename to packages/pipelines/test/unit/commands/pipelines/add.unit.test.ts
diff --git a/packages/pipelines/test/commands/pipelines/connect.test.ts b/packages/pipelines/test/unit/commands/pipelines/connect.unit.test.ts
similarity index 100%
rename from packages/pipelines/test/commands/pipelines/connect.test.ts
rename to packages/pipelines/test/unit/commands/pipelines/connect.unit.test.ts
diff --git a/packages/pipelines/test/commands/pipelines/create.test.ts b/packages/pipelines/test/unit/commands/pipelines/create.unit.test.ts
similarity index 100%
rename from packages/pipelines/test/commands/pipelines/create.test.ts
rename to packages/pipelines/test/unit/commands/pipelines/create.unit.test.ts
diff --git a/packages/pipelines/test/commands/pipelines/destroy.test.ts b/packages/pipelines/test/unit/commands/pipelines/destroy.unit.test.ts
similarity index 100%
rename from packages/pipelines/test/commands/pipelines/destroy.test.ts
rename to packages/pipelines/test/unit/commands/pipelines/destroy.unit.test.ts
diff --git a/packages/pipelines/test/commands/pipelines/diff.test.ts b/packages/pipelines/test/unit/commands/pipelines/diff.unit.test.ts
similarity index 100%
rename from packages/pipelines/test/commands/pipelines/diff.test.ts
rename to packages/pipelines/test/unit/commands/pipelines/diff.unit.test.ts
diff --git a/packages/pipelines/test/commands/pipelines/index.test.ts b/packages/pipelines/test/unit/commands/pipelines/index.unit.test.ts
similarity index 100%
rename from packages/pipelines/test/commands/pipelines/index.test.ts
rename to packages/pipelines/test/unit/commands/pipelines/index.unit.test.ts
diff --git a/packages/pipelines/test/commands/pipelines/info.test.ts b/packages/pipelines/test/unit/commands/pipelines/info.unit.test.ts
similarity index 100%
rename from packages/pipelines/test/commands/pipelines/info.test.ts
rename to packages/pipelines/test/unit/commands/pipelines/info.unit.test.ts
diff --git a/packages/pipelines/test/commands/pipelines/open.test.ts b/packages/pipelines/test/unit/commands/pipelines/open.unit.test.ts
similarity index 100%
rename from packages/pipelines/test/commands/pipelines/open.test.ts
rename to packages/pipelines/test/unit/commands/pipelines/open.unit.test.ts
diff --git a/packages/pipelines/test/commands/pipelines/promote.test.ts b/packages/pipelines/test/unit/commands/pipelines/promote.unit.test.ts
similarity index 99%
rename from packages/pipelines/test/commands/pipelines/promote.test.ts
rename to packages/pipelines/test/unit/commands/pipelines/promote.unit.test.ts
index c041dd4d42..cb231f35b3 100644
--- a/packages/pipelines/test/commands/pipelines/promote.test.ts
+++ b/packages/pipelines/test/unit/commands/pipelines/promote.unit.test.ts
@@ -1,6 +1,6 @@
 import {expect, test} from '@oclif/test'
 
-import * as PromoteCmd from '../../../src/commands/pipelines/promote'
+import * as PromoteCmd from '../../../../src/commands/pipelines/promote'
 
 describe('pipelines:promote', () => {
   const apiUrl = 'https://api.heroku.com'
diff --git a/packages/pipelines/test/commands/pipelines/remove.test.ts b/packages/pipelines/test/unit/commands/pipelines/remove.unit.test.ts
similarity index 100%
rename from packages/pipelines/test/commands/pipelines/remove.test.ts
rename to packages/pipelines/test/unit/commands/pipelines/remove.unit.test.ts
diff --git a/packages/pipelines/test/commands/pipelines/rename.test.ts b/packages/pipelines/test/unit/commands/pipelines/rename.unit.test.ts
similarity index 100%
rename from packages/pipelines/test/commands/pipelines/rename.test.ts
rename to packages/pipelines/test/unit/commands/pipelines/rename.unit.test.ts
diff --git a/packages/pipelines/test/commands/pipelines/setup.test.ts b/packages/pipelines/test/unit/commands/pipelines/setup.unit.test.ts
similarity index 99%
rename from packages/pipelines/test/commands/pipelines/setup.test.ts
rename to packages/pipelines/test/unit/commands/pipelines/setup.unit.test.ts
index c81178c8bd..9cf7827e67 100644
--- a/packages/pipelines/test/commands/pipelines/setup.test.ts
+++ b/packages/pipelines/test/unit/commands/pipelines/setup.unit.test.ts
@@ -2,7 +2,7 @@ import {CliUx} from '@oclif/core'
 import color from '@heroku-cli/color'
 import {expect, test} from '@oclif/test'
 import sinon from 'sinon'
-import pollAppSetups from '../../../src/setup/poll-app-setups'
+import pollAppSetups from '../../../../src/setup/poll-app-setups'
 
 const cli = CliUx.ux
 
diff --git a/packages/pipelines/test/commands/pipelines/transfer.test.ts b/packages/pipelines/test/unit/commands/pipelines/transfer.unit.test.ts
similarity index 100%
rename from packages/pipelines/test/commands/pipelines/transfer.test.ts
rename to packages/pipelines/test/unit/commands/pipelines/transfer.unit.test.ts
diff --git a/packages/pipelines/test/commands/pipelines/update.test.ts b/packages/pipelines/test/unit/commands/pipelines/update.unit.test.ts
similarity index 100%
rename from packages/pipelines/test/commands/pipelines/update.test.ts
rename to packages/pipelines/test/unit/commands/pipelines/update.unit.test.ts