diff --git a/.env.development b/.env.development
new file mode 100644
index 00000000..cff1ca7b
--- /dev/null
+++ b/.env.development
@@ -0,0 +1,2 @@
+NODE_ENV=development
+REACT_APP_ENV=development
diff --git a/.env.test b/.env.test
new file mode 100644
index 00000000..d8e17a78
--- /dev/null
+++ b/.env.test
@@ -0,0 +1,3 @@
+NODE_ENV=test
+REACT_APP_ENV=test
+REACT_APP_SHARETRIBE_MARKETPLACE_CURRENCY=USD
diff --git a/package.json b/package.json
index e68e3107..644ffd30 100644
--- a/package.json
+++ b/package.json
@@ -55,12 +55,12 @@
   },
   "scripts": {
     "clean": "rm -rf build/*",
-    "dev": "REACT_APP_ENV=development sharetribe-scripts start",
+    "dev": "sharetribe-scripts start",
     "build": "sharetribe-scripts build",
     "format": "prettier --write '**/*.{js,css}'",
     "format-ci": "prettier --list-different '**/*.{js,css}'",
-    "test": "export REACT_APP_SHARETRIBE_MARKETPLACE_CURRENCY=USD&&sharetribe-scripts test --env=jsdom",
-    "test-ci": "export REACT_APP_SHARETRIBE_MARKETPLACE_CURRENCY=USD&&sharetribe-scripts test --env=jsdom --runInBand",
+    "test": "sharetribe-scripts test --env=jsdom",
+    "test-ci": "sharetribe-scripts test --env=jsdom --runInBand",
     "eject": "sharetribe-scripts eject",
     "start": "node server/index.js",
     "dev-server": "export REACT_APP_ENV=development REACT_APP_CANONICAL_ROOT_URL=http://localhost:4000&&yarn run build&&nodemon --watch server server/index.js",