diff --git a/Makefile b/Makefile
index 0faadac9..a4f5f176 100644
--- a/Makefile
+++ b/Makefile
@@ -165,7 +165,7 @@ tools/.git:
 	git submodule update --init
 
 $(RUNNER_EXE): tools/.git
-	make -C tools/runner
+	GO15VENDOREXPERIMENT=1 make -C tools/runner
 
 $(PUBLISH): publish_%: $(IMAGES_UPTODATE)
 	$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker tag  $(DOCKERHUB_USER)/$* $(DOCKERHUB_USER)/$*:$(WEAVE_VERSION)
diff --git a/Vagrantfile b/Vagrantfile
index 54f0a895..5e636d2b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -22,6 +22,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.network "private_network", ip: vm_ip
   config.vm.provider :virtualbox do |vb|
+    vb.memory = 2048
     vb.customize ["modifyvm", :id, "--natdnshostresolver1", "off"]
     vb.customize ["modifyvm", :id, "--natdnsproxy1", "off"]
   end
@@ -29,6 +30,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.synced_folder ".", "/vagrant", disabled: true
   config.vm.synced_folder ".", "/home/vagrant/src/github.com/weaveworks/weave"
 
+  # Set SSH keys up to be able to run smoke tests straightaway:
+  config.vm.provision "file", source: "~/.vagrant.d/insecure_private_key", destination: "/home/vagrant/src/github.com/weaveworks/weave/test/insecure_private_key"
+
   install_build_deps config.vm, pkgs
   install_go_toochain config.vm
   tweak_user_env config.vm
diff --git a/vagrant-common.rb b/vagrant-common.rb
index d54127fb..125abeea 100644
--- a/vagrant-common.rb
+++ b/vagrant-common.rb
@@ -1,4 +1,9 @@
-$go_version = "1.4.2"
+$go_regexp = /FROM golang:(\S*).*?/
+$dockerfile_path = File.expand_path(File.join(File.dirname(__FILE__), 'build', 'Dockerfile'))
+$go_version = File.readlines($dockerfile_path).first { |line| line.match($go_regexp) }.match($go_regexp).captures.first
+if $go_version.nil?
+  raise ArgumentError.new("Failed to read Go version from Dockerfile.")
+end
 
 $go_path = "/usr/local/go/bin"