diff --git a/package.json b/package.json
index 9444f441d8d..c16b5ada74a 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "build-bundles": "lerna run build-bundles",
     "test": "yarn run lint && yarn run check && yarn run build && yarn run testonly && yarn build-bundles && yarn run e2e && yarn build-demo",
     "testonly": "jest && lerna run test --scope codemirror-graphql",
-    "e2e": "cd packages/graphiql && yarn e2e",
+    "e2e": "yarn workspace graphiql e2e",
     "cypress-open": "yarn workspace graphiql cypress-open",
     "t": "yarn run testonly",
     "lint": "eslint --ext=ts,js,jsx,tsx . || (printf '\\033[33mTry: \\033[7m yarn format \\033[0m\\n' && exit 1)",
diff --git a/packages/codemirror-graphql/package.json b/packages/codemirror-graphql/package.json
index 46baf525886..8d85f6d94fa 100644
--- a/packages/codemirror-graphql/package.json
+++ b/packages/codemirror-graphql/package.json
@@ -30,8 +30,7 @@
     "mode.js",
     "mode.js.flow",
     "utils",
-    "variables",
-    "results"
+    "variables"
   ],
   "options": {
     "mocha": "--full-trace --require resources/mochaBootload src/*/__tests__/*-test.js",
@@ -41,8 +40,8 @@
     "lint": "eslint src",
     "check": "flow check",
     "build": "yarn build-clean && yarn build-js && yarn build-esm && yarn build-flow .",
-    "build-js": "babel src --root-mode upward --ignore src/__tests__ --out-dir . && babel src --root-mode upward --ignore src/__tests__ --out-dir esm && node ../../resources/renameFileExtensions.js './esm/**/*.js' . .esm.js",
-    "build-esm": "cross-env ESM=true babel src --root-mode upward --ignore src/__tests__ --out-dir esm",
+    "build-js": "babel src --root-mode upward --ignore **/__tests__/**,**/__mocks__/** --out-dir .",
+    "build-esm": "cross-env ESM=true babel src --root-mode upward  --ignore **/__tests__/**,**/__mocks__/** --out-dir esm && node ../../resources/renameFileExtensions.js './esm/{**,!**/__tests__/}/*.js' . .esm.js",
     "build-clean": "rimraf {mode,hint,info,jump,lint}.{js,esm.js,js.flow} && rimraf esm results utils variables coverage __tests__",
     "build-flow": "node ../../resources/buildFlow.js",
     "watch": "babel --optional runtime resources/watch.js | node",
diff --git a/packages/graphql-language-service-server/package.json b/packages/graphql-language-service-server/package.json
index 8b9e7c80171..06d79073374 100644
--- a/packages/graphql-language-service-server/package.json
+++ b/packages/graphql-language-service-server/package.json
@@ -27,7 +27,7 @@
     "test": "node ../../resources/runTests.js",
     "build": "yarn build-js && yarn build-esm && yarn build-flow",
     "build-js": "node ../../resources/buildJs.js",
-    "build-esm": "cross-env ESM=true babel src --root-mode upward --ignore __tests__ --out-dir esm",
+    "build-esm": "cross-env ESM=true babel src --root-mode upward --ignore **/__tests__/**,**/__mocks__/** --out-dir esm",
     "build-flow": "node ../../resources/buildFlow.js"
   },
   "peerDependencies": {
diff --git a/resources/buildJs.js b/resources/buildJs.js
index 2a68486f9c0..f05a4f10bfa 100644
--- a/resources/buildJs.js
+++ b/resources/buildJs.js
@@ -14,11 +14,7 @@ const commands = [
   'babel',
   'src',
   '--ignore',
-  '**/__tests__/**',
-  '--ignore',
-  '**/*.spec.*',
-  '--ignore',
-  '**/*-test.*',
+  '**/__tests__/**,**/__mocks__/**,**/*.spec.*,**/*-test.*',
   '--out-dir',
   'dist',
   '--root-mode',