diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 335a0b71cf..cdeb41d690 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,57 +11,11 @@ on:
       - synchronize
 
 jobs:
-  Mac:
-    name: Test Mac
-    runs-on: macos-latest
-    steps:
-      - name: Checkout branch
-        uses: actions/checkout@v1
-      - name: Read Node version from .nvmrc
-        run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
-        id: nvm
-      - uses: actions/setup-node@v1
-        with:
-          node-version: ${{ steps.nvm.outputs.NVMRC }}
-      - name: Bootstrap packages
-        run: npm run bootstrap
-      - name: Run tests
-        run: npm test
-      - name: Build core for smoke tests
-        run: npm run app-build:smoke:core
-      - name: Build designer for smoke tests
-        run: npm run app-build:smoke:designer
-      - name: Run core smoke tests
-        run: npm run test:smoke:core
-      - name: Run designer smoke tests
-        run: npm run test:smoke:designer
-  Windows:
-    name: Test Windows
-    runs-on: windows-latest
-    steps:
-      - name: Checkout branch
-        uses: actions/checkout@v1
-      - name: Read Node version from .nvmrc
-        run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
-        id: nvm
-      - uses: actions/setup-node@v1
-        with:
-          node-version: ${{ steps.nvm.outputs.NVMRC }}
-      - name: Bootstrap packages
-        run: npm run bootstrap
-      - name: Run tests
-        run: npm test
-      - name: Build core for smoke tests
-        run: npm run app-build:smoke:core
-      - name: Build designer for smoke tests
-        run: npm run app-build:smoke:designer
-      - name: Run core smoke tests
-        run: npm run test:smoke:core
-      - name: Run designer smoke tests
-        run: npm run test:smoke:designer
-  Linux:
-    name: Test Linux
-    runs-on: ubuntu-latest
+  OS:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout branch
         uses: actions/checkout@v1
diff --git a/packages/insomnia-components/package.json b/packages/insomnia-components/package.json
index 4c5a4ea803..88fc170ae9 100644
--- a/packages/insomnia-components/package.json
+++ b/packages/insomnia-components/package.json
@@ -13,9 +13,8 @@
     "watch": "webpack --config webpack/webpack.dev.js --watch",
     "build-storybook": "build-storybook --quiet",
     "storybook": "start-storybook --port 3223",
-    "bootstrap": "npm run convert-svg && npm run build",
     "convert-svg": "rimraf assets/svgr && svgr --out-dir assets/svgr assets && rimraf assets/svgr/index.js",
-    "prepublish": "npm run convert-svg && npm run build"
+    "prepare": "npm run convert-svg && npm run build"
   },
   "devDependencies": {
     "@babel/core": "^7.7.7",