diff --git a/Library/Contributions/examples/brew-test.rb b/Library/Contributions/examples/brew-test.rb
deleted file mode 100755
index fad657c4d0..0000000000
--- a/Library/Contributions/examples/brew-test.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'extend/ENV'
-ENV.extend(HomebrewEnvExtension)
-
-ARGV.formulae.each do |f|
-  # Cannot test uninstalled formulae
-  unless f.installed?
-    puts "#{f.name} not installed"
-    next
-  end
-
-  # Cannot test formulae without a test method
-  unless f.respond_to? :test
-    puts "#{f.name} defines no test"
-    next
-  end
-
-  puts "Testing #{f.name}"
-  begin
-    f.test
-  rescue
-    puts "#{f.name}: failed"
-  end
-end
diff --git a/Library/Homebrew/cmd/test.rb b/Library/Homebrew/cmd/test.rb
new file mode 100644
index 0000000000..7f828d9484
--- /dev/null
+++ b/Library/Homebrew/cmd/test.rb
@@ -0,0 +1,24 @@
+module Homebrew extend self
+  def test
+    ARGV.formulae.each do |f|
+      # Cannot test uninstalled formulae
+      unless f.installed?
+        puts "#{f.name} not installed"
+        next
+      end
+
+      # Cannot test formulae without a test method
+      unless f.respond_to? :test
+        puts "#{f.name} defines no test"
+        next
+      end
+
+      puts "Testing #{f.name}"
+      begin
+        f.test
+      rescue
+        puts "#{f.name}: failed"
+      end
+    end
+  end
+end