diff --git a/Gemfile b/Gemfile
index 4f10a271..6ffe0bab 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,5 +15,5 @@ gem "codeclimate-test-reporter", require: nil
 
 group :development do
   gem "minitest"
-  gem "rubygems-tasks"
+
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 3fa90e00..f71d9a4d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,6 @@ GEM
     parslet (1.7.0)
       blankslate (>= 2.0, <= 4.0)
     rake (10.4.2)
-    rubygems-tasks (0.2.4)
     simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -51,7 +50,6 @@ DEPENDENCIES
   codeclimate-test-reporter
   minitest
   rake
-  rubygems-tasks
   salama!
   salama-arm!
   salama-object-file!
diff --git a/Rakefile b/Rakefile
index 7b0a8140..64c456b2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,7 +10,6 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'rake'
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -20,8 +19,7 @@ end
 
 task :default => :test
 
-require 'rubygems/tasks'
-Gem::Tasks.new
+require "bundler/gem_tasks"
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|