diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb
index d364742cc..56fe83380 100644
--- a/lib/vagrant/environment.rb
+++ b/lib/vagrant/environment.rb
@@ -47,9 +47,11 @@ module Vagrant
         :parent => nil,
         :vm_name => nil,
         :vm => nil,
-        :cwd => Dir.pwd
+        :cwd => nil,
       }.merge(opts || {})
 
+      opts[:cwd] ||= Dir.pwd
+
       opts.each do |key, value|
         instance_variable_set("@#{key}".to_sym, opts[key])
       end