diff --git a/demo-formatter/go/cmd/main.go b/demo-formatter/go/cmd/main.go
index 3abe2a24d8..eb2c1c2161 100644
--- a/demo-formatter/go/cmd/main.go
+++ b/demo-formatter/go/cmd/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	formatter "github.com/cucumber/demo-formatter-go"
+	formatter "github.com/cucumber/common/demo-formatter/go"
 	"os"
 )
 
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..9660503b05 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-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