diff --git a/tests/CentOS/Vagrantfile b/tests/CentOS/Vagrantfile
index 8291c10..e1bead9 100644
--- a/tests/CentOS/Vagrantfile
+++ b/tests/CentOS/Vagrantfile
@@ -43,6 +43,6 @@ Vagrant.configure(2) do |config|
   #
   # Run automated test installation
   #
-  config.vm.provision "install", type: "shell", path: "../../xo-install.sh", args: "--install", run: "never"
-  config.vm.provision "update", type: "shell", path: "../../xo-install.sh", args: "--update", run: "never"
+  config.vm.provision "install", type: "shell", inline: "/vagrant/xo-install.sh --install", run: "never"
+  config.vm.provision "update", type: "shell", inline: "/vagrant/xo-install.sh --update", run: "never"
 end
diff --git a/tests/Debian/Vagrantfile b/tests/Debian/Vagrantfile
index 7237299..e9fbfb0 100644
--- a/tests/Debian/Vagrantfile
+++ b/tests/Debian/Vagrantfile
@@ -43,6 +43,6 @@ Vagrant.configure(2) do |config|
   #
   # Run automated test installation
   #
-  config.vm.provision "install", type: "shell", path: "../../xo-install.sh", args: "--install", run: "never"
-  config.vm.provision "update", type: "shell", path: "../../xo-install.sh", args: "--update", run: "never"
+  config.vm.provision "install", type: "shell", inline: "/vagrant/xo-install.sh --install", run: "never"
+  config.vm.provision "update", type: "shell", inline: "/vagrant/xo-install.sh --update", run: "never"
 end
diff --git a/tests/Ubuntu/Vagrantfile b/tests/Ubuntu/Vagrantfile
index 4cf022c..18b574a 100644
--- a/tests/Ubuntu/Vagrantfile
+++ b/tests/Ubuntu/Vagrantfile
@@ -43,6 +43,6 @@ Vagrant.configure(2) do |config|
   #
   # Run automated test installation
   #
-  config.vm.provision "install", type: "shell", path: "../../xo-install.sh", args: "--install", run: "never"
-  config.vm.provision "update", type: "shell", path: "../../xo-install.sh", args: "--update", run: "never"
+  config.vm.provision "install", type: "shell", inline: "/vagrant/xo-install.sh --install", run: "never"
+  config.vm.provision "update", type: "shell", inline: "/vagrant/xo-install.sh --update", run: "never"
 end
diff --git a/xo-install.sh b/xo-install.sh
index b6beda4..7669ddb 100755
--- a/xo-install.sh
+++ b/xo-install.sh
@@ -263,6 +263,12 @@ function InstallXO {
 		mkdir -p "$INSTALLDIR"
 	fi
 
+	# Create missing xo-builds directory if doesn't exist already
+	if [[ ! -d "$INSTALLDIR/xo-builds" ]]; then
+		echo "Creating missing xo-builds directory to $INSTALLDIR/xo-builds"
+		mkdir "$INSTALLDIR/xo-builds"
+	fi
+
 	echo
 	echo "Fetching Xen Orchestra source code ..."
 	echo