diff --git a/.travis.yml b/.travis.yml
index f7537ec..e072c97 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,13 @@
 language: ruby
-rvm:
-  - 2.0.0
-  - 2.1.0
-script: "appraisal rake"
-gemfile:
-  - Gemfile
-  - gemfiles/latest_stable.gemfile
-  - gemfiles/oldest_current.gemfile
-  - gemfiles/previous_release.gemfile
-  - gemfiles/oldest_supported.gemfile
-  - gemfiles/windows_wip.gemfile
+matrix:
+  include:
+    - gemfile: Gemfile
+      rvm: 2.1.1 # Just to make sure we're ready...
+    - gemfile: Gemfile
+      rvm: 2.0.0
+    - gemfile: gemfiles/vagrant-1.7.gemfile
+      rvm: 2.0.0
+    - gemfile: gemfiles/vagrant-1.6.gemfile
+      rvm: 2.0.0
+    - gemfile: gemfiles/vagrant-1.5.gemfile
+      rvm: 2.0.0
diff --git a/Appraisals b/Appraisals
index 2fc3bee..06bc6b1 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,35 +1,42 @@
-appraise "latest-stable" do
+appraise "vagrant-1.7" do
   group :plugins do
-    gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :branch => 'v1.7.1'
+    gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.7.1'
   end
 end
 
-# Oldest (current release)
-appraise "oldest-current" do
+appraise "vagrant-1.6" do
+  gem 'bundler', '< 1.7.0', '>= 1.5.2'
   group :plugins do
-    gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :branch => 'v1.7.0'
+    gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.6.5'
   end
 end
 
 # Latest patch (previous release)
-appraise "previous-release" do
+appraise "vagrant-1.5" do
   gem 'bundler', '< 1.7.0', '>= 1.5.2'
   group :plugins do
-    gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :branch => 'v1.6.5'
+    gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.6.5'
   end
 end
 
-# Latest patch (previous release)
-appraise "oldest-supported" do
+appraise "vagrant-1.5" do
+  gem 'bundler', '< 1.7.0', '>= 1.5.2'
+  group :plugins do
+    gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.5.4'
+  end
+end
+
+# Oldest supported release
+appraise "vagrant-1.5.0" do
   gem 'bundler', '< 1.7.0', '>= 1.5.2'
   group :plugins do
-    gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :branch => 'v1.5.0'
+    gem "vagrant", :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.5.4'
   end
 end
 
 appraise "windows-wip" do
   group :plugins do
-    gem "vagrant", :git => 'https://github.com/maxlinc/vagrant', :branch => 'winrmssl'
+    gem "vagrant", :git => 'https://github.com/maxlinc/vagrant', :branch => 'winrm-1.3'
   end
 end
 
diff --git a/gemfiles/oldest_supported.gemfile b/gemfiles/vagrant_1.5.0.gemfile
similarity index 95%
rename from gemfiles/oldest_supported.gemfile
rename to gemfiles/vagrant_1.5.0.gemfile
index 38b0d0f..f87aa4a 100644
--- a/gemfiles/oldest_supported.gemfile
+++ b/gemfiles/vagrant_1.5.0.gemfile
@@ -11,7 +11,7 @@ group :development do
 end
 
 group :plugins do
-  gem "vagrant", :git => "https://github.com/mitchellh/vagrant", :branch => "v1.5.0"
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant", :tag => "v1.5.4"
   
   gemspec :path => "../"
 end
diff --git a/gemfiles/previous_release.gemfile b/gemfiles/vagrant_1.5.gemfile
similarity index 95%
rename from gemfiles/previous_release.gemfile
rename to gemfiles/vagrant_1.5.gemfile
index 333336a..f87aa4a 100644
--- a/gemfiles/previous_release.gemfile
+++ b/gemfiles/vagrant_1.5.gemfile
@@ -11,7 +11,7 @@ group :development do
 end
 
 group :plugins do
-  gem "vagrant", :git => "https://github.com/mitchellh/vagrant", :branch => "v1.6.5"
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant", :tag => "v1.5.4"
   
   gemspec :path => "../"
 end
diff --git a/gemfiles/oldest_current.gemfile b/gemfiles/vagrant_1.6.gemfile
similarity index 86%
rename from gemfiles/oldest_current.gemfile
rename to gemfiles/vagrant_1.6.gemfile
index 5b86769..e4c0da2 100644
--- a/gemfiles/oldest_current.gemfile
+++ b/gemfiles/vagrant_1.6.gemfile
@@ -2,6 +2,8 @@
 
 source "https://rubygems.org"
 
+gem "bundler", "< 1.7.0", ">= 1.5.2"
+
 group :development do
   gem "coveralls", :require => false
   gem "pry"
@@ -9,7 +11,7 @@ group :development do
 end
 
 group :plugins do
-  gem "vagrant", :git => "https://github.com/mitchellh/vagrant", :branch => "v1.7.0"
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant", :tag => "v1.6.5"
   
   gemspec :path => "../"
 end
diff --git a/gemfiles/latest_stable.gemfile b/gemfiles/vagrant_1.7.gemfile
similarity index 94%
rename from gemfiles/latest_stable.gemfile
rename to gemfiles/vagrant_1.7.gemfile
index 90ea9a7..e96f6d2 100644
--- a/gemfiles/latest_stable.gemfile
+++ b/gemfiles/vagrant_1.7.gemfile
@@ -9,7 +9,7 @@ group :development do
 end
 
 group :plugins do
-  gem "vagrant", :git => "https://github.com/mitchellh/vagrant", :branch => "v1.7.1"
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant", :tag => "v1.7.1"
   
   gemspec :path => "../"
 end
diff --git a/gemfiles/windows_wip.gemfile b/gemfiles/windows_wip.gemfile
index e4c602d..56e9c92 100644
--- a/gemfiles/windows_wip.gemfile
+++ b/gemfiles/windows_wip.gemfile
@@ -9,7 +9,7 @@ group :development do
 end
 
 group :plugins do
-  gem "vagrant", :git => "https://github.com/maxlinc/vagrant", :branch => "winrmssl"
+  gem "vagrant", :git => "https://github.com/maxlinc/vagrant", :branch => "winrm-1.3"
   
   gemspec :path => "../"
 end