diff --git a/.gitignore b/.gitignore
index 557137aa4..20006c74d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
 *.rar
 *.tar
 *.zip
+*.phar
 
 # Logs and databases #
 ######################
diff --git a/Vagrantfile b/Vagrantfile
index 35c6f4191..46312e3a0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -7,6 +7,16 @@ echo "ServerName localhost" >> /etc/apache2/apache2.conf
 service apache2 restart
 rm -f /var/www/html/index.html
 date > /etc/vagrant_provisioned_at
+# install Composer
+curl -s https://getcomposer.org/installer | php
+sudo mv composer.phar /usr/local/bin/composer
+# install PHPUnit
+wget https://phar.phpunit.de/phpunit.phar
+chmod +x phpunit.phar
+sudo mv phpunit.phar /usr/local/bin/phpunit
+phpunit --version
+# Set kanboard dir as working dir
+echo "cd /var/www/html" >> /home/vagrant/.bashrc
 SCRIPT
 
 $script_mysql = <<SCRIPT
@@ -20,6 +30,16 @@ service mysql restart
 echo "create database kanboard;" | mysql -u root
 rm -f /var/www/html/index.html
 date > /etc/vagrant_provisioned_at
+# install Composer
+curl -s https://getcomposer.org/installer | php
+sudo mv composer.phar /usr/local/bin/composer
+# install PHPUnit
+wget https://phar.phpunit.de/phpunit.phar
+chmod +x phpunit.phar
+sudo mv phpunit.phar /usr/local/bin/phpunit
+phpunit --version
+# Set kanboard dir as working dir
+echo "cd /var/www/html" >> /home/vagrant/.bashrc
 SCRIPT
 
 $script_postgres = <<SCRIPT
@@ -32,6 +52,16 @@ service apache2 restart
 service postgresql restart
 rm -f /var/www/html/index.html
 date > /etc/vagrant_provisioned_at
+# install Composer
+curl -s https://getcomposer.org/installer | php
+sudo mv composer.phar /usr/local/bin/composer
+# install PHPUnit
+wget https://phar.phpunit.de/phpunit.phar
+chmod +x phpunit.phar
+sudo mv phpunit.phar /usr/local/bin/phpunit
+phpunit --version
+# Set kanboard dir as working dir
+echo "cd /var/www/html" >> /home/vagrant/.bashrc
 SCRIPT
 
 Vagrant.configure("2") do |config|
diff --git a/docs/tests.markdown b/docs/tests.markdown
index 3f4ea5155..f3f6232fd 100644
--- a/docs/tests.markdown
+++ b/docs/tests.markdown
@@ -53,6 +53,8 @@ Time: 9.05 seconds, Memory: 17.75Mb
 OK (74 tests, 6145 assertions)
 ```
 
+**NOTE:** PHPUnit is already included in the Vagrant environment
+
 ### Testing with Mysql
 
 You must have Mysql or MariaDb installed on localhost.
diff --git a/docs/vagrant.markdown b/docs/vagrant.markdown
index 4195a2688..a1464360a 100644
--- a/docs/vagrant.markdown
+++ b/docs/vagrant.markdown
@@ -9,6 +9,8 @@ Several configurations are available:
 - Ubuntu 14.04 LTS with Kanboard/Postgresql
 - Debian 7.6 with Kanboard/Sqlite
 
+All Vagrant environments come with Composer and PHPunit pre-installed.
+
 To use those configurations, you have to install the **last version** of Virtualbox and Vagrant.
 
 Standard boxes can be download from [VagrantCloud](https://vagrantcloud.com):
@@ -24,8 +26,11 @@ If you want to test Kanboard on Ubuntu with Sqlite:
 vagrant up sqlite
 ```
 
+**NOTE:** If you downloaded the dev version from GitHub instead of the pre-packaged zip file, remember to SSH into your Vagrant environment and run ```composer install```.
+
 After the initialization, go to http://localhost:8001/.
 
+
 To test with Mysql:
 
 ```bash