diff --git a/Vagrantfile b/Vagrantfile
index 224e77c2..54cf33ac 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,21 +3,4 @@ Vagrant.configure("2") do |config|
   config.vm.box = "cloudfoundry/warden-compatible"
 
   config.vm.synced_folder '~/workspace/cf-release', '/var/cf-release'
-
-  # Requires vagrant-aws and unf plugins
-  config.vm.provider :aws do |aws, override|
-    override.vm.box = "dummy"
-    override.vm.box_url = "https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box"
-
-    override.ssh.private_key_path = ENV["WARDEN_AWS_PRIVATE_KEY_PATH"]
-
-    aws.ami = ENV["WARDEN_COMPATIBLE_AMI"] || "ami-e0b64188"
-    aws.access_key_id = ENV["AWS_ACCESS_KEY_ID"]
-    aws.secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
-    aws.instance_type = "m3.medium"
-    aws.tags = { "Name" => "warden-test" }
-    aws.block_device_mapping = [{
-      :DeviceName => "/dev/sda1", 'Ebs.VolumeSize' => 40
-    }]
-  end
 end
diff --git a/bin/test_in_vm b/bin/test_in_vm
index d87d7429..346808e0 100755
--- a/bin/test_in_vm
+++ b/bin/test_in_vm
@@ -2,6 +2,7 @@
 set -e -x -u
 
 cd $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/..
+vagrant box update
 vagrant up
 echo "===== VAGRANT BOX PROVISIONED AND STARTED ====="