diff --git a/lib/vagrant.rb b/lib/vagrant.rb
index ac9b5af51..315be5507 100644
--- a/lib/vagrant.rb
+++ b/lib/vagrant.rb
@@ -1,14 +1,14 @@
 require 'json'
 require 'i18n'
 require 'virtualbox'
-require 'vagrant/errors'
 require 'vagrant/util/glob_loader'
 
 module Vagrant
   # TODO: Move more classes over to the autoload model. We'll
   # start small, but slowly move everything over.
 
-  autoload :CLI, 'vagrant/cli'
+  autoload :CLI,    'vagrant/cli'
+  autoload :Errors, 'vagrant/errors'
 
   module Command
     autoload :Base,      'vagrant/command/base'
diff --git a/test/vagrant/action/warden_test.rb b/test/vagrant/action/warden_test.rb
index 4cb6b55b7..6ce0bbe19 100644
--- a/test/vagrant/action/warden_test.rb
+++ b/test/vagrant/action/warden_test.rb
@@ -67,12 +67,6 @@ class ActionWardenTest < Test::Unit::TestCase
       @instance.expects(:begin_rescue)
       assert_raises(RuntimeError) { @instance.call(new_env) }
     end
-
-    def new_env_with_error
-      env = new_env
-      env.error!(:foo)
-      env
-    end
   end
 
   context "recover" do