diff --git a/.travis.yml b/.travis.yml
index 0873c0918..053699a2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,4 @@
 language: ruby
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
 cache: bundler
 env:
   - DB=postgresql
@@ -14,8 +10,8 @@ before_install:
   - "sudo mv -f ~/chromedriver /usr/local/share/"
   - "sudo chmod +x /usr/local/share/chromedriver"
   - "sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver"
-  - "gem update --system"
-  - "gem install bundler"
+  - "gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true"
+  - "gem install bundler -v '< 2'"
 before_script:
   - "cp config/application-example.yml config/application.yml"
   - "cp config/database-travis.yml config/database.yml"
diff --git a/Gemfile b/Gemfile
index 86b0001ce..59882bed6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,10 @@
+# Use https only for accessing github
+# https://github.com/bundler/bundler/pull/3447
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end if Bundler::VERSION < '2'
+
 source 'https://rubygems.org'
 
 # core
diff --git a/Gemfile.lock b/Gemfile.lock
index 8e96e66a9..966cce077 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -520,4 +520,4 @@ DEPENDENCIES
   whenever (= 0.9.4)
 
 BUNDLED WITH
-   2.0.2
+   1.17.3