diff --git a/Vagrantfile b/Vagrantfile
index 2464b10..b2a7847 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,14 +1,18 @@
-# Run the script in headless mode for each of the supported OS.
+# This Vagrantfile is used to test the script
+
+# To run the script on all machines, export VAGRANT_AUTOSTART=true
+autostart_machines = ENV['VAGRANT_AUTOSTART'] == 'true' || false
+# else, run `vagrant up <hostname>`
 
 machines = [
-  { hostname: 'openvpn-debian-9', box: 'debian/stretch64' },
-  { hostname: 'openvpn-debian-8', box: 'debian/jessie64' },
-  { hostname: 'openvpn-ubuntu-1604', box: 'ubuntu/bionic64' },
-  { hostname: 'openvpn-ubuntu-1804', box: 'ubuntu/xenial64' },
-  { hostname: 'openvpn-centos-7', box: 'centos/7' },
-  { hostname: 'openvpn-fedora-29', box: 'fedora/29-cloud-base' },
-  { hostname: 'openvpn-fedora-28', box: 'fedora/28-cloud-base' },
-  { hostname: 'openvpn-archlinux', box: 'archlinux/archlinux' }
+  { hostname: 'debian-9', box: 'debian/stretch64' },
+  { hostname: 'debian-8', box: 'debian/jessie64' },
+  { hostname: 'ubuntu-1604', box: 'ubuntu/bionic64' },
+  { hostname: 'ubuntu-1804', box: 'ubuntu/xenial64' },
+  { hostname: 'centos-7', box: 'centos/7' },
+  { hostname: 'fedora-29', box: 'fedora/29-cloud-base' },
+  { hostname: 'fedora-28', box: 'fedora/28-cloud-base' },
+  { hostname: 'archlinux', box: 'archlinux/archlinux' }
 ]
 
 Vagrant.configure('2') do |config|
@@ -17,7 +21,7 @@ Vagrant.configure('2') do |config|
       v.memory = 1024
       v.cpus = 2
     end
-    config.vm.define machine[:hostname] do |machineconfig|
+    config.vm.define machine[:hostname], autostart: autostart_machines do |machineconfig|
       machineconfig.vm.hostname = machine[:hostname]
       machineconfig.vm.box = machine[:box]