diff --git a/package.json b/package.json
index c1c67c7e1d..68e4319d83 100644
--- a/package.json
+++ b/package.json
@@ -8,10 +8,10 @@
     "start": "yarn build && yarn workspace example-app start",
     "bundle": "yarn build && yarn workspace example-app bundle",
     "build": "lerna run build",
-    "test": "cross-env CI=true lerna run test --since origin/master -- --coverage",
+    "test": "yarn build && lerna run test --since origin/master -- --coverage",
+    "lint": "lerna run lint --since origin/master --",
     "create-plugin": "backstage-cli create-plugin",
     "release": "if [ \"$(git symbolic-ref --short HEAD)\" = master ]; then echo \"don't try to release master\"; exit 1; else lerna version --no-push; fi",
-    "lint": "cross-env CI=true lerna run lint --since origin/master --",
     "lerna": "lerna",
     "storybook": "yarn workspace storybook start"
   },