diff --git a/Gemfile b/Gemfile
index 8e4036faf..16246d7da 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,19 +3,15 @@ platform = RbConfig::CONFIG["host_os"].downcase
 
 source "http://rubygems.org"
 
-gem "vagrant", :path => '.'
+gemspec
 
 # Use the following gems straight from git, since Vagrant dev
 # typically coincides with it
 gem "virtualbox", :git => "git://github.com/mitchellh/virtualbox.git"
 
 if platform.include?("mingw") || platform.include?("mswin")
+  # JRuby requires these gems for development, but only
+  # on windows.
   gem "jruby-openssl", "~> 0.7.4", :platforms => :jruby
   gem "jruby-win32ole", "~> 0.8.5", :platforms => :jruby
 end
-
-group :test do
-  gem "rake"
-  gem "contest", ">= 0.1.2"
-  gem "mocha"
-end
diff --git a/vagrant.gemspec b/vagrant.gemspec
index f2d4c20c2..41c648e70 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake"
   s.add_development_dependency "contest", ">= 0.1.2"
+  s.add_development_dependency "minitest", "~> 2.5.1"
   s.add_development_dependency "mocha"
-  s.add_development_dependency "ruby-debug"
 
   s.files         = `git ls-files`.split("\n")
   s.executables   = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact