diff --git a/README.md b/README.md
index 5668efc4..0ecd3e5c 100644
--- a/README.md
+++ b/README.md
@@ -159,12 +159,12 @@ bin/test
 
 * Running tests for an specific file:
 ```bash
-ruby -Itest test/models/trackable_test.rb
+bin/test test/models/trackable_test.rb
 ```
 
 * Running a specific test given a regex:
 ```bash
-ruby -Itest test/models/trackable_test.rb --name /authentication/
+bin/test test/models/trackable_test.rb:16
 ```
 
 ## Starting with Rails?
diff --git a/bin/test b/bin/test
index cb9baa81..3670b19d 100755
--- a/bin/test
+++ b/bin/test
@@ -1,13 +1,17 @@
 #!/usr/bin/env ruby
 $: << File.expand_path(File.expand_path('../../test', __FILE__))
 
-require 'bundler/setup'
+# Remove this begin/rescue once Rails 4 support is removed.
 begin
-  require 'rails/test_unit/minitest_plugin'
+  require 'bundler/setup'
+  require 'rails/test_unit/runner'
+  require 'rails/test_unit/reporter'
+  require 'rails/test_unit/line_filtering'
+
+  Rails::TestUnitReporter.executable = 'bin/test'
+
+  Rails::TestUnit::Runner.parse_options(ARGV)
+  Rails::TestUnit::Runner.run(ARGV)
 rescue LoadError
   exec 'rake'
 end
-
-Rails::TestUnitReporter.executable = 'bin/test'
-
-exit Minitest.run(ARGV)