diff --git a/Formula/docker-machine.rb b/Formula/docker-machine.rb
index 4bee0de8156..8601a2de259 100644
--- a/Formula/docker-machine.rb
+++ b/Formula/docker-machine.rb
@@ -4,9 +4,8 @@ class DockerMachine < Formula
   desc "Create Docker hosts locally and on cloud providers"
   homepage "https://docs.docker.com/machine"
   url "https://github.com/docker/machine.git",
-    :tag => "v0.5.6",
-    :revision => "61388e98540321b34f4a27f88df9e7a4443b9ac8"
-  revision 1
+    :tag => "v0.6.0",
+    :revision => "e27fb87286cb8e7454183ce46a6e1e84b31965e9"
 
   head "https://github.com/docker/machine.git"
 
@@ -38,6 +37,6 @@ class DockerMachine < Formula
   end
 
   test do
-    system bin/"docker-machine", "ls"
+    assert_match /#{version}/, shell_output(bin/"docker-machine --version")
   end
 end