diff --git a/Makefile.frag b/Makefile.frag
index 44f429f0e..dc58081d0 100644
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -89,6 +89,7 @@ test-bootstrap:
 distcheck: package test-virtual
 
 test-virtual: package
+	sh ./scripts/run-tests-on.sh freebsd
 	sh ./scripts/run-tests-on.sh precise32
 	sh ./scripts/run-tests-on.sh precise64
 
diff --git a/Vagrantfile b/Vagrantfile
index 7156c0fc3..d0d3bf198 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -8,7 +8,6 @@ Vagrant.configure(2) do |config|
   config.vm.provider "vmware_workstation" do |vmware, override|
     vmware.vmx["memsize"] = "8192"
     vmware.vmx["numvcpus"] = "2"
-    override.vm.provision "shell", path: "scripts/vmware/kernel.sh", privileged: true
   end
 
   config.vm.define "mo", primary: true do |mo|
@@ -17,6 +16,7 @@ Vagrant.configure(2) do |config|
     mo.vm.box = "http://files.vagrantup.com/precise64.box"
     mo.vm.provider "vmware_workstation" do |vmware, override|
       override.vm.box_url = 'http://files.vagrantup.com/precise64_vmware.box'
+      override.vm.provision "shell", path: "scripts/vmware/kernel.sh", privileged: true
     end
 
     mo.vm.provision "shell", path: "scripts/ubuntu/essentials.sh", privileged: true
@@ -30,6 +30,7 @@ Vagrant.configure(2) do |config|
     ldap.vm.box = "http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box"
     ldap.vm.provider "vmware_workstation" do |vmware, override|
       override.vm.box_url = "https://dl.dropbox.com/u/5721940/vagrant-boxes/vagrant-centos-6.4-x86_64-vmware_fusion.box"
+      override.vm.provision "shell", path: "scripts/vmware/kernel.sh", privileged: true
     end
 
     ldap.vm.provision "shell", path: "scripts/centos/essentials.sh", privileged: true
@@ -42,6 +43,9 @@ Vagrant.configure(2) do |config|
     bsd.vm.box = "geoffgarside/freebsd-10.0"
 
     bsd.vm.provision "shell", path: "scripts/freebsd/essentials.sh", privileged: true
+    bsd.vm.provision "file", source: "/tmp/PHONGO-SERVERS.json", destination: "/tmp/PHONGO-SERVERS.json"
+    bsd.vm.provision "file", source: "scripts/configs/.gdbinit", destination: "/home/vagrant/.gdbinit"
+    bsd.vm.provision "shell", path: "scripts/freebsd/phongo.sh", privileged: true
     bsd.vm.synced_folder ".", "/phongo", :nfs => true, id: "vagrant-root"
   end
 
@@ -51,6 +55,7 @@ Vagrant.configure(2) do |config|
     linux.vm.box = "http://files.vagrantup.com/precise64.box"
     linux.vm.provider "vmware_workstation" do |vmware, override|
       override.vm.box_url = 'http://files.vagrantup.com/precise64_vmware.box'
+      override.vm.provision "shell", path: "scripts/vmware/kernel.sh", privileged: true
     end
 
     linux.vm.provision "shell", path: "scripts/ubuntu/essentials.sh", privileged: true
@@ -65,6 +70,7 @@ Vagrant.configure(2) do |config|
     linux.vm.box = "bjori/precise32"
     linux.vm.provider "vmware_workstation" do |vmware, override|
       override.vm.box_url = "bjori/precise32"
+      override.vm.provision "shell", path: "scripts/vmware/kernel.sh", privileged: true
     end
 
     linux.vm.provision "shell", path: "scripts/ubuntu/essentials.sh", privileged: true
diff --git a/scripts/freebsd/essentials.sh b/scripts/freebsd/essentials.sh
index 8907bcc7e..61e7926b2 100644
--- a/scripts/freebsd/essentials.sh
+++ b/scripts/freebsd/essentials.sh
@@ -1,13 +1,13 @@
 # Update ports
-sudo portsnap fetch extract
+sudo portsnap fetch extract update
 
 # Minimum required PHP install + pecl
-sudo pkg install pcre php56 php56-openssl php56-json pear autoconf cyrus-sasl
+sudo pkg install -y pcre php56 php56-openssl php56-json pear autoconf pkgconf cyrus-sasl
 
 # We need vim. git requires curl. mongoc requires libtool and automake 
-sudo pkg install vim git curl libtool automake
+sudo pkg install -y vim git curl libtool automake
 
 # I can't stand emacs
-echo 'set -o vi' | sudo tee /etc/profile.d/vishell.sh
+echo 'set -o vi' | sudo tee -a /etc/profile
 
 
diff --git a/scripts/freebsd/phongo.sh b/scripts/freebsd/phongo.sh
new file mode 100644
index 000000000..2b2460af5
--- /dev/null
+++ b/scripts/freebsd/phongo.sh
@@ -0,0 +1,10 @@
+ls -1 /phongo/mongodb*.tgz | sort -n -r | xargs sudo pecl install -f 2>&1 > /phongo/.build
+if test $? -eq 0; then
+	php -m | grep -q mongodb || echo "extension=mongodb.so" | sudo tee -a /usr/local/etc/php/extensions.ini
+	pecl run-tests -q -p mongodb 2>&1 > /phongo/.tests
+else
+	tail -n50 /phongo/.build
+	exit 3
+fi
+
+