diff --git a/package.json b/package.json
index ff4d82d8..5f42b318 100644
--- a/package.json
+++ b/package.json
@@ -9,15 +9,23 @@
   },
   "main": "index.js",
   "scripts": {
-    "tasks": "babel-node tasks.js",
-    "test": "echo \"Preparing test database...\" && babel-node test-helpers/dropDatabase.js && knex --env test migrate:latest && DB_ENV=test mocha test",
-    "test-old": "echo \"Preparing test database...\" && knex --env test migrate:rollback && knex --env test migrate:latest && DB_ENV=test mocha test",
-    "travis": "eslint *.js src && npm run flow && echo \"Preparing test database...\" && knex --env travis migrate:latest && DB_ENV=travis babel-node ./node_modules/istanbul/lib/cli cover _mocha -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
-    "start": "NODE_ENV=development babel-node --source-maps -- index.js 2>&1 | bunyan",
-    "docker-start": "knex migrate:latest && NODE_ENV=production npm run webpack:build:prod && NODE_ENV=production babel-node index.js",
+    "start": "NODE_ENV=development run-p run:app run:tasks",
+    "docker-start": "NODE_ENV=production DB_ENV=staging run-s webpack:build:prod update-db:production run:app",
+    "test": "NODE_ENV=development DB_ENV=test run-s reset-db:test mocha",
+    "coverage": "NODE_ENV=development DB_ENV=test npm run coverage:run",
+    "travis": "NODE_ENV=development DB_ENV=travis run-s reset-db:travis travis:test lint flow",
+    "travis:test": "run-s coverage:run coverage:coveralls coverage:clean",
+    "reset-db:test": "echo \"Preparing test database...\" && babel-node test-helpers/dropDatabase.js && knex --env test migrate:latest",
+    "reset-db:travis": "echo \"Preparing test database...\" && knex --env travis migrate:latest",
+    "update-db:production": "knex --env staging migrate:latest",
+    "mocha": "mocha test",
     "lint": "eslint *.js src bin",
     "flow": "flow check --show-all-errors --color always --profile",
-    "coverage": "DB_ENV=test babel-node ./node_modules/istanbul/lib/cli cover _mocha -- -R spec",
+    "coverage:run": "babel-node ./node_modules/istanbul/lib/cli cover _mocha -- -R spec",
+    "coverage:coveralls": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
+    "coverage:clean": "rm -rf ./coverage",
+    "run:app": "babel-node index.js 2>&1 | bunyan",
+    "run:tasks": "babel-node tasks.js",
     "import:geonames": "babel-node bin/geonames.js",
     "import:geotags": "babel-node bin/geotags.js",
     "import:schools": "babel-node bin/schools.js",
@@ -149,6 +157,7 @@
     "mocha": "~3.1.0",
     "mock-aws": "^1.2.3",
     "node-fetch": "^1.3.3",
+    "npm-run-all": "^3.1.2",
     "ora": "^0.2.0",
     "postcss-loader": "~0.13.0",
     "react-addons-test-utils": "^15.1.0",