diff --git a/.travis.yml b/.travis.yml
index 1611756..f7fa338 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.2.6
+  - 2.4.1
 services:
   - redis-server
 before_install:
diff --git a/Gemfile b/Gemfile
index 6e2b971..49b11a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ gem "sinatra-contrib"
 gem "activesupport"
 gem "riak-client", git: "https://github.com/5apps/riak-ruby-client", branch: "invalid_uri_error"
 gem "fog-aws"
-gem "rest-client"
+gem "rest-client", "~> 2.1.0.rc1" # Fixes a memory leak in Ruby 2.4
 gem "redis"
 # Remove require when we can update to 3.0, which sets the new storage
 # format to columnar by default. Increases performance
diff --git a/Gemfile.lock b/Gemfile.lock
index a5591a1..e794749 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,7 +13,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.1)
+    activesupport (5.1.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -24,7 +24,7 @@ GEM
     concurrent-ruby (1.0.5)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    excon (0.57.0)
+    excon (0.57.1)
     faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
     fog-aws (1.4.0)
@@ -43,6 +43,7 @@ GEM
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     i18n (0.8.4)
@@ -79,7 +80,8 @@ GEM
     raindrops (0.18.0)
     rake (12.0.0)
     redis (3.3.3)
-    rest-client (2.0.2)
+    rest-client (2.1.0.rc1)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
@@ -122,7 +124,7 @@ DEPENDENCIES
   rainbows
   rake
   redis
-  rest-client
+  rest-client (~> 2.1.0.rc1)
   riak-client!
   sentry-raven
   sinatra