diff --git a/Gemfile b/Gemfile
index 3b4162a..9788942 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,12 +7,12 @@ gemspec
 if ENV['CUCUMBER_RUBY_CORE']
   gem 'cucumber-core', path: ENV['CUCUMBER_RUBY_CORE']
 elsif !ENV['CUCUMBER_USE_RELEASED_GEMS']
-  gem 'cucumber-core', github: 'cucumber/cucumber-ruby-core', branch: 'gherkin-7'
+  gem 'cucumber-core', github: 'cucumber/cucumber-ruby-core', branch: 'gherkin-8'
 end
 
 if ENV['CUCUMBER_RUBY']
   gem 'cucumber', path: ENV['CUCUMBER_RUBY']
 elsif !ENV['CUCUMBER_USE_RELEASED_GEMS']
-  gem 'cucumber', github: 'cucumber/cucumber-ruby', branch: 'gherkin-7'
+  gem 'cucumber', github: 'cucumber/cucumber-ruby', branch: 'gherkin-8'
 end
 
diff --git a/cucumber-wire.gemspec b/cucumber-wire.gemspec
index 2304a81..c195ac8 100644
--- a/cucumber-wire.gemspec
+++ b/cucumber-wire.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.3'
 
   s.add_dependency 'cucumber-core', '~> 5.0', '>= 5.0.0'
-  s.add_dependency 'cucumber-expressions', '~> 8.0', '>= 8.0.0'
+  s.add_dependency 'cucumber-expressions', '~> 8.0', '>= 8.0.2'
 
   s.add_development_dependency 'cucumber', '~> 3.1', '>= 3.1.2'
   s.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
diff --git a/features/snippets_message.feature b/features/snippets_message.feature
index bbc79eb..452cad9 100644
--- a/features/snippets_message.feature
+++ b/features/snippets_message.feature
@@ -23,7 +23,7 @@ Feature: Snippets message
     Given there is a wire server running on port 54321 which understands the following protocol:
       | request                                                                                          | response                         |
       | ["step_matches",{"name_to_match":"we're all wired"}]                                             | ["success",[]]                   |
-      | ["snippet_text",{"step_keyword":"Given","multiline_arg_class":"","step_name":"we're all wired"}] | ["success","foo()\n  bar;\nbaz"] |
+      | ["snippet_text",{"step_keyword":"Given","multiline_arg_class":"","step_name":"we're all wired"}] | ["success","foo()\n\tbar;\nbaz"] |
       | ["begin_scenario"]                                                                               | ["success"]                      |
       | ["end_scenario"]                                                                                 | ["success"]                      |
     When I run `cucumber -f pretty`
@@ -41,7 +41,7 @@ Feature: Snippets message
     And the output should contain:
       """
       foo()
-        bar;
+      \tbar;
       baz
 
       """
diff --git a/lib/cucumber/wire/add_hooks_filter.rb b/lib/cucumber/wire/add_hooks_filter.rb
index b1c2538..609b235 100644
--- a/lib/cucumber/wire/add_hooks_filter.rb
+++ b/lib/cucumber/wire/add_hooks_filter.rb
@@ -9,8 +9,8 @@ def test_case(test_case)
       end
 
       def before_hook(test_case)
-        # TODO: is this dependency on Cucumber::Hooks OK? Feels a bit internal..
-        # TODO: how do we express the location of the hook? Should we create one hook per connection so we can use the host:port of the connection?
+        # TODO: is this dependency on Cucumber::Hooks OK? Feels a bit internal..
+        # TODO: how do we express the location of the hook? Should we create one hook per connection so we can use the host:port of the connection?
         Cucumber::Hooks.before_hook(Core::Test::Location.new('TODO:wire')) do
           connections.begin_scenario(test_case)
         end
diff --git a/lib/cucumber/wire/connections.rb b/lib/cucumber/wire/connections.rb
index 4e57a22..5bff8df 100644
--- a/lib/cucumber/wire/connections.rb
+++ b/lib/cucumber/wire/connections.rb
@@ -26,7 +26,7 @@ def initialize(connections, configuration, registry)
       def find_match(test_step)
         matches = step_matches(test_step.name)
         return unless matches.any?
-        # TODO: handle ambiguous matches (push to cucumber?)
+        # TODO: handle ambiguous matches (push to cucumber?)
         matches.first
       end
 
diff --git a/lib/cucumber/wire/protocol/requests.rb b/lib/cucumber/wire/protocol/requests.rb
index 5e32d11..6454a57 100644
--- a/lib/cucumber/wire/protocol/requests.rb
+++ b/lib/cucumber/wire/protocol/requests.rb
@@ -69,7 +69,7 @@ def handle_pending(message)
           end
 
           def handle_diff!(tables)
-            # TODO: figure out if / how we could get a location for a table from the wire (or make a null location)
+            # TODO: figure out if / how we could get a location for a table from the wire (or make a null location)
             location = Core::Test::Location.new(__FILE__, __LINE__)
             table1 = table(tables[0], location)
             table2 = table(tables[1], location)