diff --git a/Gemfile b/Gemfile
index c21bd683d3..1a60cb13bf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -65,7 +65,7 @@ end
 
 group :test do
   gem 'codeclimate-test-reporter', '>= 1.0.8', require: false
-  gem 'machinist', '~> 1.0.6'
+  gem 'machinist', '~> 2.0'
   gem 'mock_redis'
   gem 'parallel_tests'
   gem 'rack-test'
diff --git a/Gemfile.lock b/Gemfile.lock
index 746a1ece9d..802b3d7002 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -289,7 +289,7 @@ GEM
     loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    machinist (1.0.6)
+    machinist (2.0)
     method_source (1.1.0)
     mime-types (3.7.0)
       logger
@@ -637,7 +637,7 @@ DEPENDENCIES
   json-schema
   listen
   loggregator_emitter (~> 5.0)
-  machinist (~> 1.0.6)
+  machinist (~> 2.0)
   mime-types (~> 3.7)
   mock_redis
   multipart-parser