diff --git a/docs/process-management.md b/docs/process-management.md
index 0da24ae37..619ec8f60 100644
--- a/docs/process-management.md
+++ b/docs/process-management.md
@@ -9,3 +9,5 @@ ps:stop <app>                                   Stop app container(s)
 ps:restart <app>                                Restart app container(s)
 ps:restartall                                   Restart all deployed app containers
 ```
+
+*NOTE*: As of v0.3.14, `dokku deploy:all` in now deprecated by `ps:restartall` and will be removed in a future version.
diff --git a/dokku b/dokku
index 1afae5002..4ccca789a 100755
--- a/dokku
+++ b/dokku
@@ -157,6 +157,12 @@ case "$1" in
     pluginhook update
     ;;
 
+  # DEPRECATED as of v0.3.14
+  deploy:all)
+      echo "*DEPRECATED* in v0.3.14: deploy:all will be removed in future versions"
+      dokku ps:restartall
+    ;;
+
   help|'')
     echo "Usage: dokku COMMAND <app> [command-specific-options]"
     echo ""
diff --git a/tests/unit/ps.bats b/tests/unit/ps.bats
index a6ba7ca75..53efb0b35 100644
--- a/tests/unit/ps.bats
+++ b/tests/unit/ps.bats
@@ -11,7 +11,10 @@ teardown() {
 }
 
 @test "ps" {
-  skip "circleci does not support docker exec at the moment"
+  # 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