diff --git a/demo-formatter/go/cucumber_demo_formatter.go b/demo-formatter/go/cucumber_demo_formatter.go
index be9955a1f4..69ee7afeaf 100644
--- a/demo-formatter/go/cucumber_demo_formatter.go
+++ b/demo-formatter/go/cucumber_demo_formatter.go
@@ -8,7 +8,7 @@ package cucumber_demo_formatter
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 	"io"
 )
 
diff --git a/demo-formatter/go/cucumber_demo_formatter_test.go b/demo-formatter/go/cucumber_demo_formatter_test.go
index 6506654d8c..ef647af3ff 100644
--- a/demo-formatter/go/cucumber_demo_formatter_test.go
+++ b/demo-formatter/go/cucumber_demo_formatter_test.go
@@ -3,7 +3,7 @@ package cucumber_demo_formatter
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 	"github.com/stretchr/testify/require"
 	"testing"
 )
diff --git a/demo-formatter/go/go.mod b/demo-formatter/go/go.mod
index 246aad82c5..f22e94085a 100644
--- a/demo-formatter/go/go.mod
+++ b/demo-formatter/go/go.mod
@@ -1,10 +1,10 @@
 module github.com/cucumber/common/demo-formatter/go
 
 require (
-	github.com/cucumber/messages-go/v16 v16.0.1
+	github.com/cucumber/common/messages/go/v16 v16.0.0
 	github.com/stretchr/testify v1.7.0
 )
 
-replace github.com/cucumber/messages-go/v16 => ../../messages/go
+replace github.com/cucumber/common/messages/go/v16 => ../../messages/go
 
 go 1.13
diff --git a/gherkin/go/astbuilder.go b/gherkin/go/astbuilder.go
index 6fbe9be228..4440e7bf8b 100644
--- a/gherkin/go/astbuilder.go
+++ b/gherkin/go/astbuilder.go
@@ -1,7 +1,7 @@
 package gherkin
 
 import (
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 	"strings"
 )
 
diff --git a/gherkin/go/bench_test.go b/gherkin/go/bench_test.go
index b606934385..ae3e9f7351 100644
--- a/gherkin/go/bench_test.go
+++ b/gherkin/go/bench_test.go
@@ -1,7 +1,7 @@
 package gherkin
 
 import (
-	messages "github.com/cucumber/messages-go/v16"
+	messages "github.com/cucumber/common/messages/go/v16"
 	"strings"
 	"testing"
 )
diff --git a/gherkin/go/cmd/main.go b/gherkin/go/cmd/main.go
index 72d127b948..4c46974b8b 100644
--- a/gherkin/go/cmd/main.go
+++ b/gherkin/go/cmd/main.go
@@ -10,7 +10,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/cucumber/common/gherkin/go/v19"
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 	"os"
 )
 
diff --git a/gherkin/go/example_test.go b/gherkin/go/example_test.go
index a16dadae43..38d913ff46 100644
--- a/gherkin/go/example_test.go
+++ b/gherkin/go/example_test.go
@@ -2,7 +2,7 @@ package gherkin
 
 import (
 	"fmt"
-	messages "github.com/cucumber/messages-go/v16"
+	messages "github.com/cucumber/common/messages/go/v16"
 	"os"
 	"strings"
 )
diff --git a/gherkin/go/gherkin.go b/gherkin/go/gherkin.go
index 40a395b0f5..c221f66ab4 100644
--- a/gherkin/go/gherkin.go
+++ b/gherkin/go/gherkin.go
@@ -3,7 +3,7 @@ package gherkin
 import (
 	"bufio"
 	"fmt"
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 	"io"
 	"strings"
 )
diff --git a/gherkin/go/go.mod b/gherkin/go/go.mod
index 83c8893160..7c8a592d56 100644
--- a/gherkin/go/go.mod
+++ b/gherkin/go/go.mod
@@ -1,10 +1,10 @@
 module github.com/cucumber/common/gherkin/go/v19
 
 require (
-	github.com/cucumber/messages-go/v16 v16.0.1
+	github.com/cucumber/common/messages/go/v16 v16.0.0
 	github.com/stretchr/testify v1.7.0
 )
 
-replace github.com/cucumber/messages-go/v16 => ../../messages/go
+replace github.com/cucumber/common/messages/go/v16 => ../../messages/go
 
 go 1.13
diff --git a/gherkin/go/go.sum b/gherkin/go/go.sum
index 2cd1c71c1b..d1dbee95b1 100644
--- a/gherkin/go/go.sum
+++ b/gherkin/go/go.sum
@@ -1,3 +1,8 @@
+github.com/cucumber/common/messages/go/v16 v16.0.0-20210616143200-16b27f1a25b2/go.mod h1:M2BQJNS63rzmxaz/VgU6US/REUbAeROGJ6QdntfY98Y=
+github.com/cucumber/gherkin-go v5.1.0+incompatible h1:RCvyVI6KQLI2IJkijZBeJcE4K3U7DnhQ1RjD7VV+AIk=
+github.com/cucumber/gherkin-go/v19 v19.0.3 h1:mMSKu1077ffLbTJULUfM5HPokgeBcIGboyeNUof1MdE=
+github.com/cucumber/gherkin-go/v19 v19.0.3/go.mod h1:jY/NP6jUtRSArQQJ5h1FXOUgk5fZK24qtE7vKi776Vw=
+github.com/cucumber/messages-go v3.0.0+incompatible h1:IIZ+6dRebLcM80cStIDad0Wr6ipgs4zYGMqNH0kp7pY=
 github.com/cucumber/messages-go/v16 v16.0.0 h1:3QR8gAu6JYUI8U7gVUMZs/m+C0ZlBcTwf2QKCHMDH88=
 github.com/cucumber/messages-go/v16 v16.0.0/go.mod h1:EJcyR5Mm5ZuDsKJnT2N9KRnBK30BGjtYotDKpwQ0v6g=
 github.com/cucumber/messages-go/v16 v16.0.1 h1:fvkpwsLgnIm0qugftrw2YwNlio+ABe2Iu94Ap8GMYIY=
diff --git a/gherkin/go/messages.go b/gherkin/go/messages.go
index a627680d45..ecb010eec8 100644
--- a/gherkin/go/messages.go
+++ b/gherkin/go/messages.go
@@ -3,7 +3,7 @@ package gherkin
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 	"io"
 	"io/ioutil"
 	"strings"
diff --git a/gherkin/go/messages_test.go b/gherkin/go/messages_test.go
index c95d7e7b50..b322e80574 100644
--- a/gherkin/go/messages_test.go
+++ b/gherkin/go/messages_test.go
@@ -3,7 +3,7 @@ package gherkin
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"testing"
diff --git a/gherkin/go/pickles.go b/gherkin/go/pickles.go
index a9050426ec..7ae7c4966b 100644
--- a/gherkin/go/pickles.go
+++ b/gherkin/go/pickles.go
@@ -1,7 +1,7 @@
 package gherkin
 
 import (
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 	"strings"
 )
 
diff --git a/gherkin/go/pickles_test.go b/gherkin/go/pickles_test.go
index f3a4a2dcd9..0aed003f87 100644
--- a/gherkin/go/pickles_test.go
+++ b/gherkin/go/pickles_test.go
@@ -3,7 +3,7 @@ package gherkin
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 	"os"
 	"strings"
 )
diff --git a/json-formatter/go/go.mod b/json-formatter/go/go.mod
index a039730024..5aa1f58ab9 100644
--- a/json-formatter/go/go.mod
+++ b/json-formatter/go/go.mod
@@ -1,11 +1,11 @@
 module github.com/cucumber/common/json-formatter/go/v18
 
-replace github.com/cucumber/messages-go/v16 => ../../messages/go
+replace github.com/cucumber/common/messages/go/v16 => ../../messages/go
 
 go 1.13
 
 require (
-	github.com/cucumber/messages-go/v16 v16.0.1
+	github.com/cucumber/common/messages/go/v16 v16.0.1
 	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/gomega v1.13.0
 )
diff --git a/json-formatter/go/json.go b/json-formatter/go/json.go
index c5ad35f849..6c08e768e6 100644
--- a/json-formatter/go/json.go
+++ b/json-formatter/go/json.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 )
 
 type Formatter struct {
diff --git a/json-formatter/go/message_lookup.go b/json-formatter/go/message_lookup.go
index 9ab5ddfcb0..f7baddc196 100644
--- a/json-formatter/go/message_lookup.go
+++ b/json-formatter/go/message_lookup.go
@@ -3,7 +3,7 @@ package json
 import (
 	"fmt"
 
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 )
 
 type MessageLookup struct {
diff --git a/json-formatter/go/message_lookup_test.go b/json-formatter/go/message_lookup_test.go
index 349c458d72..34b13cf1cd 100644
--- a/json-formatter/go/message_lookup_test.go
+++ b/json-formatter/go/message_lookup_test.go
@@ -1,7 +1,7 @@
 package json
 
 import (
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/json-formatter/go/test_case.go b/json-formatter/go/test_case.go
index 566f977ff2..84ca9032f3 100644
--- a/json-formatter/go/test_case.go
+++ b/json-formatter/go/test_case.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 )
 
 type TestCase struct {
diff --git a/json-formatter/go/test_case_test.go b/json-formatter/go/test_case_test.go
index 6758bef01b..5e1d532c81 100644
--- a/json-formatter/go/test_case_test.go
+++ b/json-formatter/go/test_case_test.go
@@ -1,7 +1,7 @@
 package json
 
 import (
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/json-formatter/go/test_helpers.go b/json-formatter/go/test_helpers.go
index 8e2a97ce38..b34691fb52 100644
--- a/json-formatter/go/test_helpers.go
+++ b/json-formatter/go/test_helpers.go
@@ -1,7 +1,7 @@
 package json
 
 import (
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 )
 
 func makeScenario(id string, steps []*messages.Step) *messages.Scenario {
diff --git a/json-formatter/go/test_step.go b/json-formatter/go/test_step.go
index c5b0b933b2..3d8c6032a2 100644
--- a/json-formatter/go/test_step.go
+++ b/json-formatter/go/test_step.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 )
 
 type TestStep struct {
diff --git a/json-formatter/go/test_step_test.go b/json-formatter/go/test_step_test.go
index 598433fb8b..adb009dd55 100644
--- a/json-formatter/go/test_step_test.go
+++ b/json-formatter/go/test_step_test.go
@@ -1,7 +1,7 @@
 package json
 
 import (
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/messages/go/v16"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )