diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9272a0572..848d496e7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,7 @@
 
 # job_environment will setup the environment for any job being executed.
 job_environment: &job_environment
+  NODE_ENV: test
   DISABLE_CREATE_MONGO_INDEXES: TRUE
 
 # job_defaults applies all the defaults for each job.
@@ -21,7 +22,6 @@ create_indexes: &create_indexes
 # integration_environment is the environment that configures the tests.
 integration_environment: &integration_environment
   <<: *job_environment
-  NODE_ENV: test
   CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
   E2E_MAX_RETRIES: 3
 
diff --git a/package.json b/package.json
index f5c1764c9..b0a37528e 100644
--- a/package.json
+++ b/package.json
@@ -19,11 +19,11 @@
     "lint": "npm-run-all lint:*",
     "plugins:reconcile": "./bin/cli plugins reconcile",
     "test": "npm-run-all test:jest test:mocha",
-    "test:jest": "TEST_MODE=unit NODE_ENV=test jest --runInBand",
-    "test:client": "TEST_MODE=unit NODE_ENV=test jest --projects client",
+    "test:jest": "NODE_ENV=test jest --runInBand",
+    "test:client": "NODE_ENV=test jest --projects client",
     "test:server": "npm-run-all test:server:jest test:server:mocha",
-    "test:server:mocha": "TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
-    "test:server:jest": "TEST_MODE=unit NODE_ENV=test jest --runInBand --projects .",
+    "test:server:mocha": "NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
+    "test:server:jest": "NODE_ENV=test jest --runInBand --projects .",
     "e2e": "./scripts/e2e.js",
     "e2e:ci": "./scripts/e2e-ci.sh",
     "heroku-postbuild": "npm-run-all plugins:reconcile build",