diff --git a/Rakefile b/Rakefile
index 051ca98..adabcf9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,4 +11,5 @@ Hoe.spec "vlad-git" do
   self.readme_file      = "README.rdoc"
   self.rubyforge_name   = "hitsquad"
   self.testlib          = :minitest
+  self.extra_deps       << ["vlad", ">= 2.1.0"]
 end
diff --git a/lib/vlad/git.rb b/lib/vlad/git.rb
index cd0048b..25c7f5b 100644
--- a/lib/vlad/git.rb
+++ b/lib/vlad/git.rb
@@ -80,7 +80,7 @@ def fast_checkout_applicable?(revision, destination)
               "cd -; then exit 0; else exit 1; fi &>/dev/null" ].join(" && ")
       run cmd
       return true
-    rescue Vlad::CommandFailedError
+    rescue Rake::CommandFailedError
       return false
     end
   end
diff --git a/test/test_vlad_git.rb b/test/test_vlad_git.rb
index db63ba2..2cd492d 100644
--- a/test/test_vlad_git.rb
+++ b/test/test_vlad_git.rb
@@ -1,9 +1,9 @@
-require 'vlad_test_case'
+require 'rake/test_case'
 require 'vlad'
 require 'vlad/git'
 require 'mocha'
 
-class TestVladGit < VladTestCase
+class TestVladGit < Rake::TestCase
   def setup
     super
     @scm = Vlad::Git.new