diff --git a/Gemfile b/Gemfile
index 66e4209ad..147f627a5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,6 @@ group :test do
   gem "rake"
   gem "rack-test", "~> 0.5"
   gem "mocha", "~> 0.9.7"
-  gem "leftright", :platforms => :mri_18
   gem "yajl-ruby", "~>0.8.2", :platforms => :mri
   gem "json", "~>1.5.3", :platforms => [:jruby, :rbx]
   gem "hoptoad_notifier"
diff --git a/Rakefile b/Rakefile
index dd4108603..e90d3d7da 100644
--- a/Rakefile
+++ b/Rakefile
@@ -20,18 +20,11 @@ require 'rake/testtask'
 
 task :default => :test
 
-if command?(:rg)
-  desc "Run the test suite with rg"
-  task :test do
-    Dir['test/**/*_test.rb'].each do |f|
-      sh("rg #{f}")
-    end
-  end
-else
-  Rake::TestTask.new do |test|
-    test.libs << "test"
-    test.test_files = FileList['test/**/*_test.rb']
-  end
+Rake::TestTask.new do |test|
+  test.verbose = true
+  test.libs << "test"
+  test.libs << "lib"
+  test.test_files = FileList['test/**/*_test.rb']
 end
 
 if command? :kicker