diff --git a/Formula/app-engine-go-32.rb b/Formula/app-engine-go-32.rb
index 8dbdbe2cde..351e3ed977 100644
--- a/Formula/app-engine-go-32.rb
+++ b/Formula/app-engine-go-32.rb
@@ -12,12 +12,15 @@ class AppEngineGo32 < Formula
     :because => "both install the same binaries"
 
   def install
-    cd ".."
-    share.install "go_appengine" => name
+    share.install Dir["*"]
     %w[
       api_server.py appcfg.py bulkloader.py bulkload_client.py dev_appserver.py download_appstats.py goapp
     ].each do |fn|
-      bin.install_symlink share/name/fn
+      bin.install_symlink share/fn
     end
   end
+
+  test do
+    assert_match /^usage: goapp serve/, shell_output("#{bin}/goapp help serve").strip
+  end
 end