diff --git a/Gemfile b/Gemfile
index 5346732..fa75df1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-group :development do
-  gem 'vagrant', github: 'mitchellh/vagrant', tag: 'v1.1.2'
-end
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..a72b4c1
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,12 @@
+require 'bundler/gem_helper'
+
+# Change to the directory of this file.
+Dir.chdir(File.expand_path("../", __FILE__))
+
+namespace :gem do
+  Bundler::GemHelper.install_tasks
+end
+
+task :test do
+  sh 'bash test/test.sh'
+end
diff --git a/bin/build.sh b/bin/build.sh
deleted file mode 100755
index ff9a0cf..0000000
--- a/bin/build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-rm *.gem
-gem uninstall -a vagrant-hostmanager
-gem build *.gemspec
-gem install *.gem
-vagrant plugin install vagrant-hostmanager
diff --git a/bin/test.sh b/test/test.sh
similarity index 70%
rename from bin/test.sh
rename to test/test.sh
index d7552f8..461e86e 100755
--- a/bin/test.sh
+++ b/test/test.sh
@@ -1,4 +1,11 @@
+gem uninstall -a vagrant-hostmanager
+gem build *.gemspec
+gem install *.gem
+rm *.gem
+vagrant plugin install vagrant-hostmanager
+
 cd test
+
 vagrant up
 echo "[server1] /etc/hosts file:"
 vagrant ssh server1 -c 'cat /etc/hosts'
@@ -8,5 +15,5 @@ vagrant destroy server1 -f
 echo "[server2] /etc/hosts file:"
 vagrant ssh server2 -c 'cat /etc/hosts'
 vagrant destroy server2 -f
-cd ..
 
+cd ..