diff --git a/.gitignore b/.gitignore
index b68de29..3df710d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ coverage/
 spec/*.lock
 doc
 .yardoc
+Gemfile.lock
diff --git a/.travis.yml b/.travis.yml
index b171cfb..26f2ee2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,20 @@
+language: ruby
 cache:
   - bundler
-language: ruby
 before_install:
   - gem update --system
   - gem install bundler
-rvm:
-  - 2.1
-script: bundle exec rake checks
 matrix:
   include:
-    # Test install on clean system
-    - install: true
-      script:
-        - gem build github_changelog_generator
-        - gem install *.gem
-    - install: true
-      script:
-        - gem build github_changelog_generator
-        - bundle install --gemfile spec/install-gem-in-bundler.gemfile
+    - rvm: 2.1
+      install: true # This skips 'bundle install'
+      script: gem build github_changelog_generator && gem install *.gem
+    - rvm: 2.1
+      install: true # This skips 'bundle install'
+      script: gem build github_changelog_generator && bundle install
+      gemfile: spec/install-gem-in-bundler.gemfile
+    - rvm: 2.1
+
 notifications:
   email:
     recipients:
diff --git a/Gemfile b/Gemfile
index 3231675..7cd902e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,14 +2,20 @@ source "https://rubygems.org"
 
 gemspec
 
-group :test do
+group :development do
+end
+
+group :development, :test do
   gem "rake"
   gem "bundler"
-  gem "rubocop"
-  gem "overcommit"
+  gem "overcommit", ">= 0.31"
+  gem "rubocop", ">= 0.43"
+end
+
+group :test do
   gem "coveralls", "~>0.8", require: false
   gem "simplecov", "~>0.10", require: false
   gem "codeclimate-test-reporter", "~>0.4"
-  # JSON 2.0.1 is ruby 2.0+
-  gem "json", "< 2.0"
+  gem "json"
+  gem "rspec", "< 4"
 end
diff --git a/Rakefile b/Rakefile
index 2249f8b..b5dcc06 100644
--- a/Rakefile
+++ b/Rakefile
@@ -36,4 +36,4 @@ task :copy_man_page_to_manpath do |_t|
 end
 
 task checks: [:rubocop, :rspec]
-task default: [:copy_man_page_to_manpath]
+task default: [:rubocop, :rspec]
diff --git a/github_changelog_generator.gemspec b/github_changelog_generator.gemspec
index 3d785ca..db2348d 100644
--- a/github_changelog_generator.gemspec
+++ b/github_changelog_generator.gemspec
@@ -24,11 +24,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "rake", ">= 10.0"
-  spec.add_runtime_dependency "github_api", ">= 0.12"
+  spec.add_runtime_dependency "github_api", ">= 0.14"
   spec.add_runtime_dependency "rainbow", ">= 2.1"
-
-  spec.add_development_dependency "overcommit", ">= 0.31"
-  spec.add_development_dependency "rspec", ">= 3.2"
-  spec.add_development_dependency "bundler", ">= 1.7"
-  spec.add_development_dependency "rubocop", ">= 0.31"
 end