diff --git a/Library/Homebrew/cmd/tests.rb b/Library/Homebrew/cmd/tests.rb
index 27be1cd2f8..19576ddd39 100644
--- a/Library/Homebrew/cmd/tests.rb
+++ b/Library/Homebrew/cmd/tests.rb
@@ -27,6 +27,11 @@ module Homebrew
 
       args = []
       args << "--trace" if ARGV.include? "--trace"
+      if ARGV.value("only")
+        test_name, test_method = ARGV.value("only").split("/", 2)
+        args << "TEST=test_#{test_name}.rb"
+        args << "TESTOPTS=--name=test_#{test_method}" if test_method
+      end
       args += ARGV.named.select { |v| v[/^TEST(OPTS)?=/] }
       system "bundle", "exec", "rake", "test", *args