diff --git a/package.json b/package.json
index 742a21e0ce1..e8770baf805 100644
--- a/package.json
+++ b/package.json
@@ -13,10 +13,10 @@
     "wp_org_slug": "woocommerce"
   },
   "scripts": {
+    "install": " if [ -z \"$SKIP_LERNA_BOOTSTRAP\" ]; then npx lerna bootstrap --hoist; fi",
     "check:subset-installed": "npm list --depth 1 install-subset > /dev/null 2>&1",
     "install:subset-only": "npm install --no-package-lock --no-save install-subset",
-    "install:no-e2e": "npm run check:subset-installed --silent || npm run install:subset-only && npx install-subset i no-e2e",
-    "install:e2e": "npx lerna bootstrap --hoist && npm run check:subset-installed --silent || npm run install:subset-only && npx install-subset i e2e",
+    "install:no-e2e": "npm run check:subset-installed --silent || npm run install:subset-only && SKIP_LERNA_BOOTSTRAP=true npx install-subset i no-e2e",
     "build": "./bin/build-zip.sh",
     "build:core": "grunt && npm run makepot",
     "build:dev": "npm run build:core && npm run build:packages",
@@ -130,15 +130,6 @@
     "ie 9"
   ],
   "subsets": {
-    "no-e2e": {
-      "exclude": [
-        "@woocommerce/api",
-        "@woocommerce/e2e-core-tests",
-        "@woocommerce/e2e-environment",
-        "@woocommerce/e2e-utils",
-        "@wordpress/e2e-test-utils"
-      ]
-    },
     "e2e": {
       "include": [
         "@woocommerce/api",