diff --git a/Vagrantfile b/Vagrantfile
index 907983c..74c6b78 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -43,8 +43,9 @@ Vagrant.configure("2") do |config|
     set -e
 
     # Upgrade Yunohost and the system packages (disabled)
-    #DEBIAN_FRONTEND=noninteractive sudo apt-get update
-    #DEBIAN_FRONTEND=noninteractive sudo apt-get upgrade --yes -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold'
+    sudo apt-get update
+    sudo apt-get upgrade --yes
+    sudo apt-get dist-upgrade --yes
 
     # Finish Yunohost installation
     if ! [[ -f /etc/yunohost/installed ]]; then
diff --git a/test.sh b/test.sh
index 9d0f890..6698a15 100755
--- a/test.sh
+++ b/test.sh
@@ -77,14 +77,14 @@ function _assert_success() {
 function setup() {
   if $SKIP_SNAPSHOT; then
     echo "--- Starting Vagrant box ---"
-    vagrant up
+    vagrant up --no-provision
     echo "--- (Skipping snapshot restore) ---"
     return
   fi
 
   if (vagrant snapshot list | grep 'yunohost-jessie-pristine' > /dev/null); then
     echo "--- Restoring Vagrant snapshot ---"
-    vagrant snapshot restore yunohost-jessie-pristine
+    vagrant snapshot restore --no-provision yunohost-jessie-pristine
   else
     echo "--- Provisioning Vagrant box ---"
     vagrant up --provision