diff --git a/Rakefile b/Rakefile
index 5c6a93f..08849ba 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,13 @@
-require 'rubygems'
+#!/usr/bin/env rake
+require 'bundler'
+require "bundler/gem_tasks"
+Bundler::GemHelper.install_tasks
+
 require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/*.rb'
+  test.verbose = true
+end
 
 task :default => :test
-
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = FileList["test/feedbag_test.rb"]
-  t.verbose = true
-end