diff --git a/Gemfile b/Gemfile
index 137bac0..fecf40e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,9 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.2.7'
+  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.5.1'
 end
 
-gemspec
+group :plugins do
+  gemspec
+end
diff --git a/test/Vagrantfile b/test/Vagrantfile
index b3a4f31..4c624d1 100644
--- a/test/Vagrantfile
+++ b/test/Vagrantfile
@@ -1,7 +1,9 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-Vagrant.require_plugin('vagrant-hostmanager')
+if Gem::Version.new(::Vagrant::VERSION) < Gem::Version.new('1.5')
+  Vagrant.require_plugin('vagrant-hostmanager')
+end
 
 Vagrant.configure('2') do |config|
   config.vm.box = 'precise64'