diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f8bbd86..10ca4f08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ appear at the top.
 
   * Add your entries here, remember to credit yourself however you want to be
     credited!
+  * Add vmware_fusion Vagrant provider. Nick Townsend
 
 ## 1.5.1
 
diff --git a/Rakefile b/Rakefile
index 29b3e28f..f935c08e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,6 +3,11 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
+task :default => :test
+
+desc "Run all tests"
+task :test => ['test:units', 'test:functional']
+
 namespace :test do
 
   Rake::TestTask.new(:units) do |t|
@@ -15,17 +20,8 @@ namespace :test do
     t.test_files = FileList['test/functional/**/test*.rb']
   end
 
-  task :test do
-    Rake::Task['test:units'].execute
-    Rake::Task['test:functional'].execute
-  end
-
-  task default: :test
-
 end
 
-task :default => 'test:default'
-
 Rake::Task["test:functional"].enhance do
   warn "Remember there are still some VMs running, kill them with `vagrant halt` if you are finished using them."
 end
diff --git a/Vagrantfile b/Vagrantfile
index b3ff41e8..5e77f040 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,7 +2,12 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = 'precise64'
-  config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
+  config.vm.provider "vmware_fusion" do |vmf|
+    vmf.box_url = "http://files.vagrantup.com/precise64_vmware.box"
+  end
+  config.vm.provider "virtualbox" do |vb|
+    config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
+  end
 
   json_config_path = File.join("test", "boxes.json")
   list = File.open(json_config_path).read