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 6e2db96614..4c46974b8b 100644
--- a/gherkin/go/cmd/main.go
+++ b/gherkin/go/cmd/main.go
@@ -9,8 +9,8 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"github.com/cucumber/gherkin-go/v19"
-	"github.com/cucumber/messages-go/v16"
+	"github.com/cucumber/common/gherkin/go/v19"
+	"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-generate-tokens/gherkin-generate-tokens.go b/gherkin/go/gherkin-generate-tokens/gherkin-generate-tokens.go
index cb99bbf48c..b0cdd0d0af 100644
--- a/gherkin/go/gherkin-generate-tokens/gherkin-generate-tokens.go
+++ b/gherkin/go/gherkin-generate-tokens/gherkin-generate-tokens.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/cucumber/gherkin-go/v19"
+	"github.com/cucumber/common/gherkin/go/v19"
 	"io"
 	"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 6e56b9d19c..b1569aa5c1 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/common/messages/v16 v16.0.0
+	github.com/cucumber/common/messages/go/v16 v16.0.0-20210616143200-16b27f1a25b2
 	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"
 )