diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9d0878ad..8595483ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 2.1.2 - 2020/06/23
+
+## Fixes
+
+- Make --retry and --fail-fast play nicely together by bumping Cucumber to 3.1.2.
+
 # 2.1.1 - 2020/06/22
 
 ## Fixes
diff --git a/Gemfile.lock b/Gemfile.lock
index b9d12f200..0b6913a0d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,8 +3,8 @@ PATH
   specs:
     bugsnag-maze-runner (2.0.0)
       appium_lib (~> 10.2)
-      cucumber (~> 3.1.0)
-      cucumber-expressions (= 5.0.15)
+      cucumber (~> 3.1.2)
+      cucumber-expressions (~> 6.0.0)
       curb (~> 0.9.6)
       gherkin (~> 5.1.0)
       minitest (~> 5.0)
@@ -34,20 +34,20 @@ GEM
     builder (3.2.4)
     childprocess (3.0.0)
     concurrent-ruby (1.1.6)
-    cucumber (3.1.0)
+    cucumber (3.1.2)
       builder (>= 2.1.2)
-      cucumber-core (~> 3.1.0)
-      cucumber-expressions (~> 5.0.4)
+      cucumber-core (~> 3.2.0)
+      cucumber-expressions (~> 6.0.1)
       cucumber-wire (~> 0.0.1)
       diff-lcs (~> 1.3)
-      gherkin (~> 5.0)
+      gherkin (~> 5.1.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (3.1.0)
+    cucumber-core (3.2.1)
       backports (>= 3.8.0)
       cucumber-tag_expressions (~> 1.1.0)
-      gherkin (>= 5.0.0)
-    cucumber-expressions (5.0.15)
+      gherkin (~> 5.0)
+    cucumber-expressions (6.0.1)
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
     curb (0.9.10)
diff --git a/bugsnag-maze-runner.gemspec b/bugsnag-maze-runner.gemspec
index 1661d29e6..63788f898 100644
--- a/bugsnag-maze-runner.gemspec
+++ b/bugsnag-maze-runner.gemspec
@@ -17,15 +17,14 @@ Gem::Specification.new do |spec|
 
   spec.executables = spec.files.grep(%r{^bin/[\w\-]+$}) { |f| File.basename(f) }
 
-  spec.add_dependency 'cucumber', '~> 3.1.0'
+  spec.add_dependency 'cucumber', '~> 3.1.2'
   spec.add_dependency 'gherkin', '~> 5.1.0'
   spec.add_dependency 'minitest', '~> 5.0'
   spec.add_dependency 'os', '~> 1.0.0'
   spec.add_dependency 'test-unit', '~> 3.3.0'
 
   spec.add_dependency 'appium_lib', '~> 10.2'
-  # Pinned due to issues with 5.0.16-5.0.17
-  spec.add_dependency 'cucumber-expressions', '5.0.15'
+  spec.add_dependency 'cucumber-expressions', '~> 6.0.0'
   spec.add_dependency 'curb', '~> 0.9.6'
   spec.add_dependency 'optimist', '~> 3.0.1'
   spec.add_dependency 'rake', '~> 12.3.3'