diff --git a/tests/apps/config/package.json b/tests/apps/config/package.json
index 7bdf8db0c..eb17caf0c 100644
--- a/tests/apps/config/package.json
+++ b/tests/apps/config/package.json
@@ -5,7 +5,7 @@
     "express": "2.5.x"
   },
   "engines": {
-    "node": "0.8.x",
-    "npm": "1.1.x"
+    "node": "0.10.x",
+    "npm": "2.7.x"
   }
-}
\ No newline at end of file
+}
diff --git a/tests/apps/gitsubmodules/package.json b/tests/apps/gitsubmodules/package.json
index 742e06105..ca800a5df 100644
--- a/tests/apps/gitsubmodules/package.json
+++ b/tests/apps/gitsubmodules/package.json
@@ -6,6 +6,6 @@
   },
   "engines": {
     "node": "0.10.x",
-    "npm": "1.3.x"
+    "npm": "2.7.x"
   }
-}
\ No newline at end of file
+}
diff --git a/tests/apps/nodejs-express-noprocfile/package.json b/tests/apps/nodejs-express-noprocfile/package.json
index 7f0462b58..6f8ca43e1 100644
--- a/tests/apps/nodejs-express-noprocfile/package.json
+++ b/tests/apps/nodejs-express-noprocfile/package.json
@@ -5,8 +5,8 @@
     "express": "2.5.x"
   },
   "engines": {
-    "node": "0.8.x",
-    "npm": "1.1.x"
+    "node": "0.10.x",
+    "npm": "2.7.x"
   },
   "scripts": {
     "start": "node web.js"
diff --git a/tests/apps/nodejs-express/package.json b/tests/apps/nodejs-express/package.json
index 7bdf8db0c..eb17caf0c 100644
--- a/tests/apps/nodejs-express/package.json
+++ b/tests/apps/nodejs-express/package.json
@@ -5,7 +5,7 @@
     "express": "2.5.x"
   },
   "engines": {
-    "node": "0.8.x",
-    "npm": "1.1.x"
+    "node": "0.10.x",
+    "npm": "2.7.x"
   }
-}
\ No newline at end of file
+}
diff --git a/tests/unit/00_dokku-standard.bats b/tests/unit/00_dokku-standard.bats
index d7a5cde95..a77286159 100644
--- a/tests/unit/00_dokku-standard.bats
+++ b/tests/unit/00_dokku-standard.bats
@@ -26,7 +26,18 @@ build_nginx_config() {
   dokku nginx:build-config $TEST_APP
 }
 
-@test "run (with tty)" {
+@test "core: unknown command" {
+  run /bin/bash -c "dokku fakecommand"
+  echo "output: "$output
+  echo "status: "$status
+  assert_failure
+  run /bin/bash -c "dokku fakecommand | grep -q 'is not a dokku command'"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}
+
+@test "core: run (with tty)" {
   deploy_app
   run /bin/bash -c "dokku run $TEST_APP ls /app/package.json"
   echo "output: "$output
@@ -34,7 +45,7 @@ build_nginx_config() {
   assert_success
 }
 
-@test "run (without tty)" {
+@test "core: run (without tty)" {
   deploy_app
   run /bin/bash -c ": |dokku run $TEST_APP ls /app/package.json"
   echo "output: "$output
@@ -42,7 +53,7 @@ build_nginx_config() {
   assert_success
 }
 
-@test "run (with --options)" {
+@test "core: run (with --options)" {
   deploy_app
   run /bin/bash -c "dokku --force --quiet run $TEST_APP node --version"
   echo "output: "$output
@@ -50,7 +61,7 @@ build_nginx_config() {
   assert_success
 }
 
-@test "urls (non-ssl)" {
+@test "core: urls (non-ssl)" {
   assert_urls "http://dokku.me"
   build_nginx_config
   assert_urls "http://${TEST_APP}.dokku.me"
@@ -58,7 +69,7 @@ build_nginx_config() {
   assert_urls "http://${TEST_APP}.dokku.me" "http://test.dokku.me"
 }
 
-@test "urls (app ssl)" {
+@test "core: urls (app ssl)" {
   setup_test_tls
   assert_urls "https://dokku.me"
   build_nginx_config
@@ -67,7 +78,7 @@ build_nginx_config() {
   assert_urls "https://node-js-app.dokku.me" "http://${TEST_APP}.dokku.me" "http://test.dokku.me"
 }
 
-@test "urls (wildcard ssl)" {
+@test "core: urls (wildcard ssl)" {
   setup_test_tls_wildcard
   assert_urls "https://dokku.me"
   build_nginx_config
diff --git a/tests/unit/apps.bats b/tests/unit/apps.bats
old mode 100755
new mode 100644
diff --git a/tests/unit/build-env.bats b/tests/unit/build-env.bats
index cd062742a..f18b58bfd 100644
--- a/tests/unit/build-env.bats
+++ b/tests/unit/build-env.bats
@@ -10,7 +10,7 @@ teardown() {
   destroy_app
 }
 
-@test "build-env with special chars" {
+@test "build-env: with special chars" {
   run dokku config:set $TEST_APP NEWRELIC_APP_NAME="$TEST_APP (Staging)"
   echo "output: "$output
   echo "status: "$status
diff --git a/tests/unit/cleanup.bats b/tests/unit/cleanup.bats
index 22e0c4f5b..31c3c82db 100644
--- a/tests/unit/cleanup.bats
+++ b/tests/unit/cleanup.bats
@@ -10,7 +10,7 @@ teardown() {
   destroy_app
 }
 
-@test "remove exited containers" {
+@test "core: remove exited containers" {
   # make sure we have many exited containers of the same 'type'
   run bash -c "for cnt in 1 2 3; do dokku run $TEST_APP hostname; done"
   echo "output: "$output
diff --git a/tests/unit/ps-buildstep.bats b/tests/unit/ps-buildstep.bats
index 9973731ef..4cbbdd0ed 100644
--- a/tests/unit/ps-buildstep.bats
+++ b/tests/unit/ps-buildstep.bats
@@ -21,22 +21,7 @@ teardown() {
 #   assert_success
 # }
 
-@test "ps:start (buildstep)" {
-  run bash -c "dokku ps:stop $TEST_APP"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-  run bash -c "dokku ps:start $TEST_APP"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-  run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-}
-
-@test "ps:stop (buildstep)" {
+@test "ps (buildstep)" {
   run bash -c "dokku ps:stop $TEST_APP"
   echo "output: "$output
   echo "status: "$status
@@ -45,9 +30,16 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_failure
-}
 
-@test "ps:restart (buildstep)" {
+  run bash -c "dokku ps:start $TEST_APP"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
   run bash -c "dokku ps:restart $TEST_APP"
   echo "output: "$output
   echo "status: "$status
@@ -56,9 +48,7 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
-}
 
-@test "ps:rebuild (buildstep)" {
   run bash -c "dokku ps:rebuild $TEST_APP"
   echo "output: "$output
   echo "status: "$status
diff --git a/tests/unit/ps-dockerfile.bats b/tests/unit/ps-dockerfile.bats
index ddc1d3706..1cce3a704 100644
--- a/tests/unit/ps-dockerfile.bats
+++ b/tests/unit/ps-dockerfile.bats
@@ -10,33 +10,18 @@ teardown() {
   destroy_app
 }
 
+# @test "ps (dockerfile)" {
+#   # CI support: 'Ah. I just spoke with our Docker expert --
+#   # looks like docker exec is built to work with docker-under-libcontainer,
+#   # but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry
+#   skip "circleci does not support docker exec at the moment."
+#   run bash -c "dokku ps $TEST_APP | grep -q \"node web.js\""
+#   echo "output: "$output
+#   echo "status: "$status
+#   assert_success
+# }
+
 @test "ps (dockerfile)" {
-  # CI support: 'Ah. I just spoke with our Docker expert --
-  # looks like docker exec is built to work with docker-under-libcontainer,
-  # but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry
-  skip "circleci does not support docker exec at the moment."
-  run bash -c "dokku ps $TEST_APP | grep -q \"node web.js\""
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-}
-
-@test "ps:start (dockerfile)" {
-  run bash -c "dokku ps:stop $TEST_APP"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-  run bash -c "dokku ps:start $TEST_APP"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-  run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-}
-
-@test "ps:stop (dockerfile)" {
   run bash -c "dokku ps:stop $TEST_APP"
   echo "output: "$output
   echo "status: "$status
@@ -45,9 +30,16 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_failure
-}
 
-@test "ps:restart (dockerfile)" {
+  run bash -c "dokku ps:start $TEST_APP"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
   run bash -c "dokku ps:restart $TEST_APP"
   echo "output: "$output
   echo "status: "$status
@@ -56,9 +48,7 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
-}
 
-@test "ps:rebuild (dockerfile)" {
   run bash -c "dokku ps:rebuild $TEST_APP"
   echo "output: "$output
   echo "status: "$status