2 files changed, 7 insertions, 0 deletions
diff --git a/vagrant/after.sh b/vagrant/after.sh
index 440f1bc49e..09a6fe25fa 100755
--- a/vagrant/after.sh
+++ b/vagrant/after.sh
@@ -27,4 +27,7 @@ sudo chown -R vagrant /tmp/phpbb.sqlite3
 # Add DEBUG mode to phpBB to remove annoying installer warnings
 sed -i "$ a @define('DEBUG', true);" ${PHPBB_CONFIG}
 
+# Update the PHP memory limits (enough to allow phpunit tests to run)
+sed -i "s/memory_limit = .*/memory_limit = 768M/" /etc/php5/fpm/php.ini
+
 echo "Your board is ready at http://192.168.10.10/"
diff --git a/vagrant/bootstrap.yaml b/vagrant/bootstrap.yaml
index 06a6147b86..1c2b265712 100644
--- a/vagrant/bootstrap.yaml
+++ b/vagrant/bootstrap.yaml
@@ -22,6 +22,10 @@ sites:
 databases:
     - phpbb
 
+variables:
+    - key: APP_ENV
+      value: local
+
 # blackfire:
 #     - id: foo
 #       token: bar