diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffdefda8..4ef1bee7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,8 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CO
 ### Changed
 
 * Updated monorepo libraries:
-  - cucumber-gherkin ~> 12
-  - cucumber-messages ~> 11
+  - cucumber-gherkin ~> 13
+  - cucumber-messages ~> 12
 
 ### Removed
 
diff --git a/cucumber-core.gemspec b/cucumber-core.gemspec
index 968ce0eb..cd8c28f4 100644
--- a/cucumber-core.gemspec
+++ b/cucumber-core.gemspec
@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
                     'source_code_uri' => 'https://github.com/cucumber/cucumber-ruby-core',
                   }
 
-  s.add_dependency 'cucumber-gherkin', '~> 12.0', '>= 12.0.0'
-  s.add_dependency 'cucumber-messages', '~> 11.1', '>= 11.1.1'
+  s.add_dependency 'cucumber-gherkin', '~> 13.0', '>= 13.0.0'
+  s.add_dependency 'cucumber-messages', '~> 12.0', '>= 12.0.0'
   s.add_dependency 'cucumber-tag-expressions', '~> 2.0', '>= 2.0.4'
 
   s.add_development_dependency 'coveralls', '~> 0.8', '>= 0.8.23'
diff --git a/lib/cucumber/core/gherkin/parser.rb b/lib/cucumber/core/gherkin/parser.rb
index abc3f311..a867da1b 100644
--- a/lib/cucumber/core/gherkin/parser.rb
+++ b/lib/cucumber/core/gherkin/parser.rb
@@ -25,9 +25,8 @@ def document(document)
               event_bus.gherkin_source_parsed(message.gherkin_document)
             elsif !message.pickle.nil?
               receiver.pickle(message.pickle)
-            elsif !message.attachment.nil?
-              # Parse error
-              raise Core::Gherkin::ParseError.new("#{document.uri}: #{message.attachment.body}")
+            elsif message.parse_error
+              raise Core::Gherkin::ParseError.new("#{document.uri}: #{message.parse_error.message}")
             else
               raise "Unknown message: #{message.to_hash}"
             end
diff --git a/lib/cucumber/core/test/result.rb b/lib/cucumber/core/test/result.rb
index 77ba3d7c..a8f77283 100644
--- a/lib/cucumber/core/test/result.rb
+++ b/lib/cucumber/core/test/result.rb
@@ -44,8 +44,8 @@ def with_filtered_backtrace(filter)
           end
 
           def to_message
-            Cucumber::Messages::TestStepResult.new(
-              status: Cucumber::Messages::TestStepResult::Status::UNKNOWN,
+            Cucumber::Messages::TestStepFinished::TestStepResult.new(
+              status: Cucumber::Messages::TestStepFinished::TestStepResult::Status::UNKNOWN,
               duration: UnknownDuration.new.to_message_duration
             )
           end
@@ -75,8 +75,8 @@ def to_s
           end
 
           def to_message
-            Cucumber::Messages::TestStepResult.new(
-              status: Cucumber::Messages::TestStepResult::Status::PASSED,
+            Cucumber::Messages::TestStepFinished::TestStepResult.new(
+              status: Cucumber::Messages::TestStepFinished::TestStepResult::Status::PASSED,
               duration: duration.to_message_duration
             )
           end
@@ -128,8 +128,8 @@ def to_message
               message = ""
             end
 
-            Cucumber::Messages::TestStepResult.new(
-              status: Cucumber::Messages::TestStepResult::Status::FAILED,
+            Cucumber::Messages::TestStepFinished::TestStepResult.new(
+              status: Cucumber::Messages::TestStepFinished::TestStepResult::Status::FAILED,
               duration: duration.to_message_duration,
               message: message
             )
@@ -216,8 +216,8 @@ def to_s
           end
 
           def to_message
-            Cucumber::Messages::TestStepResult.new(
-              status: Cucumber::Messages::TestStepResult::Status::UNDEFINED,
+            Cucumber::Messages::TestStepFinished::TestStepResult.new(
+              status: Cucumber::Messages::TestStepFinished::TestStepResult::Status::UNDEFINED,
               duration: duration.to_message_duration
             )
           end
@@ -241,8 +241,8 @@ def to_s
           end
 
           def to_message
-            Cucumber::Messages::TestStepResult.new(
-              status: Cucumber::Messages::TestStepResult::Status::SKIPPED,
+            Cucumber::Messages::TestStepFinished::TestStepResult.new(
+              status: Cucumber::Messages::TestStepFinished::TestStepResult::Status::SKIPPED,
               duration: duration.to_message_duration
             )
           end
@@ -266,8 +266,8 @@ def to_s
           end
 
           def to_message
-            Cucumber::Messages::TestStepResult.new(
-              status: Cucumber::Messages::TestStepResult::Status::PENDING,
+            Cucumber::Messages::TestStepFinished::TestStepResult.new(
+              status: Cucumber::Messages::TestStepFinished::TestStepResult::Status::PENDING,
               duration: duration.to_message_duration
             )
           end
diff --git a/spec/cucumber/core/test/result_spec.rb b/spec/cucumber/core/test/result_spec.rb
index d7418a22..66dbcfa9 100644
--- a/spec/cucumber/core/test/result_spec.rb
+++ b/spec/cucumber/core/test/result_spec.rb
@@ -25,7 +25,7 @@ module Cucumber::Core::Test
 
       it "converts to a Cucumber::Message::TestResult" do
         message = result.to_message
-        expect(message.status).to eq(Cucumber::Messages::TestStepResult::Status::PASSED)
+        expect(message.status).to eq(Cucumber::Messages::TestStepFinished::TestStepResult::Status::PASSED)
       end
 
       it "has a duration" do
@@ -75,7 +75,7 @@ module Cucumber::Core::Test
 
       it "converts to a Cucumber::Message::TestResult" do
         message = result.to_message
-        expect(message.status).to eq(Cucumber::Messages::TestStepResult::Status::FAILED)
+        expect(message.status).to eq(Cucumber::Messages::TestStepFinished::TestStepResult::Status::FAILED)
       end
 
       it "requires both constructor arguments" do
@@ -144,7 +144,7 @@ module Cucumber::Core::Test
 
       it "converts to a Cucumber::Message::TestResult" do
         message = result.to_message
-        expect(message.status).to eq(Cucumber::Messages::TestStepResult::Status::UNKNOWN)
+        expect(message.status).to eq(Cucumber::Messages::TestStepFinished::TestStepResult::Status::UNKNOWN)
       end
     end
 
@@ -207,7 +207,7 @@ module Cucumber::Core::Test
 
       it "converts to a Cucumber::Message::TestResult" do
         message = result.to_message
-        expect(message.status).to eq(Cucumber::Messages::TestStepResult::Status::UNDEFINED)
+        expect(message.status).to eq(Cucumber::Messages::TestStepFinished::TestStepResult::Status::UNDEFINED)
       end
 
       specify { expect( result.to_sym ).to eq :undefined }
@@ -236,7 +236,7 @@ module Cucumber::Core::Test
 
       it "converts to a Cucumber::Message::TestResult" do
         message = result.to_message
-        expect(message.status).to eq(Cucumber::Messages::TestStepResult::Status::SKIPPED)
+        expect(message.status).to eq(Cucumber::Messages::TestStepFinished::TestStepResult::Status::SKIPPED)
       end
 
       specify { expect( result.to_sym ).to eq :skipped }
@@ -263,7 +263,7 @@ module Cucumber::Core::Test
 
       it "converts to a Cucumber::Message::TestResult" do
         message = result.to_message
-        expect(message.status).to eq(Cucumber::Messages::TestStepResult::Status::PENDING)
+        expect(message.status).to eq(Cucumber::Messages::TestStepFinished::TestStepResult::Status::PENDING)
       end
 
       specify { expect( result.to_sym ).to eq :pending }