diff --git a/.gitignore b/.gitignore
index 56a9a4b63..f106e7f6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,3 @@
 **/*~
 *~
 *.swp
-test/test
-test/.vagrant
-test/package
-test/nytprof.out
-test/nytprof/*
-test/scratch.txt
-test/coverage*
-doc/output/*
-doc/doc/output/*
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 000000000..bdf08e9a3
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,2 @@
+output/*
+doc/output/*
diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 2869145b7..6838f1ac5 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -153,6 +153,16 @@
     </contributor-list>
 
     <release-list>
+        <release date="XXXX-XX-XX" version="1.18dev" title="UNDER DEVELOPMENT">
+            <release-test-list>
+                <release-refactor-list>
+                    <release-item>
+                        <p>Updated vagrant to new version and image.</p>
+                    </release-item>
+                </release-refactor-list>
+            </release-test-list>
+        </release>
+
         <release date="2017-03-13" version="1.17" title="Page Checksum Bug Fix">
             <release-core-list>
                 <release-bug-list>
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 000000000..b10050d1a
--- /dev/null
+++ b/test/.gitignore
@@ -0,0 +1,7 @@
+test
+.vagrant
+package
+nytprof*
+scratch.txt
+coverage*
+ubuntu-xenial-16.04-cloudimg-console.log
diff --git a/test/Vagrantfile b/test/Vagrantfile
index a0be13a4e..b5f1bf4c4 100644
--- a/test/Vagrantfile
+++ b/test/Vagrantfile
@@ -4,8 +4,8 @@ Vagrant.configure(2) do |config|
         vb.cpus = 8
     end
 
-    config.vm.box = "bento/ubuntu-16.04"
-    config.vm.box_version = "2.2.9";
+    config.vm.box = "ubuntu/xenial64"
+    config.vm.box_version = "20170311.0.0"
 
     config.vm.provider :virtualbox do |vb|
         vb.name = "pgbackrest-test"
@@ -18,10 +18,21 @@ Vagrant.configure(2) do |config|
         # Suppress "dpkg-reconfigure: unable to re-open stdin: No file or directory" warning
         export DEBIAN_FRONTEND=noninteractive
 
+        # Assign a host name
+        sed -i 's/^127\.0\.0\.1\t.*/127\.0\.0\.1\tlocalhost pgbackrest-test/' /etc/hosts
+        hostnamectl set-hostname pgbackrest-test
+
         # Update Apt
         echo 'Update Apt' && date
         apt-get update
 
+        # Install build tools
+        apt-get install -y devscripts build-essential lintian git txt2man debhelper
+
+        # Synchronize date
+        apt-get install -y ntpdate
+        ntpdate pool.ntp.org
+
         # Install Docker
         echo 'Install Docker' && date
         apt-get install -y apt-transport-https ca-certificates
@@ -31,7 +42,7 @@ Vagrant.configure(2) do |config|
         apt-get install -y linux-image-extra-$(uname -r)
         apt-get install -y docker-engine
         service docker start
-        sudo usermod -aG docker vagrant
+        sudo usermod -aG docker ubuntu
 
         # Install Perl modules
         echo 'Install Perl Modules' && date
@@ -49,14 +60,14 @@ Vagrant.configure(2) do |config|
         # Create backrest user and postgres group
         echo 'Create Postgres Group & pgBackRest User' && date
         groupadd -g5000 postgres
-        adduser --uid=5001 --ingroup=vagrant --disabled-password --gecos "" backrest
+        adduser --uid=5001 --ingroup=ubuntu --disabled-password --gecos "" backrest
 
         # Build VM images
         echo 'Build VM Images' && date
         rm -rf /backrest/test/.vagrant/docker/*
         rm -rf /backrest/test/.vagrant/libc/*
         rm -rf /backrest/test/.vagrant/package/*
-        sudo su - vagrant -c '/backrest/test/test.pl --vm-build'
+        sudo su - ubuntu -c '/backrest/test/test.pl --vm-build'
 
         echo 'Build End' && date
     SHELL