diff --git a/Gemfile b/Gemfile
index cfe43f76c..52095fe0f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gem 'aruba', '~> 0.5.3'
 gem 'cucumber', '~> 1.3.9'
-gem 'sinatra'
+gem 'sinatra', '>= 2.2.0'
 gem 'ronn'
diff --git a/Gemfile.lock b/Gemfile.lock
index f38ffb94b..beba6bf87 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,11 +22,14 @@ GEM
     gherkin (2.12.2-java)
       multi_json (~> 1.3)
     hpricot (0.8.4)
+    hpricot (0.8.4-java)
     multi_json (1.10.1)
     multi_test (0.1.1)
     mustache (0.99.4)
-    rack (1.4.1)
-    rack-protection (1.2.0)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    rack (2.2.3)
+    rack-protection (2.2.0)
       rack
     rdiscount (1.6.8)
     ronn (0.7.3)
@@ -37,11 +40,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.2)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    tilt (1.3.3)
+    ruby2_keywords (0.0.5)
+    sinatra (2.2.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.2.0)
+      tilt (~> 2.0)
+    tilt (2.0.10)
 
 PLATFORMS
   java
@@ -51,7 +56,7 @@ DEPENDENCIES
   aruba (~> 0.5.3)
   cucumber (~> 1.3.9)
   ronn
-  sinatra
+  sinatra (>= 2.2.0)
 
 BUNDLED WITH
-   1.11.2
+   1.17.3