diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9cadf23b..5d095350 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,7 +59,7 @@ jobs:
     executor:
       name: go/golang
       tag: 1.10-alpine
-    working_directory: /go/src/gotest.tools
+    working_directory: /go/src/gotest.tools/v3
     steps:
       - go/install: {package: git}
       - go/install-ssh
diff --git a/assert/assert.go b/assert/assert.go
index 932da155..83610aa8 100644
--- a/assert/assert.go
+++ b/assert/assert.go
@@ -62,7 +62,7 @@ See http://gotest.tools/assert/cmd/gty-migrate-from-testify.
 
 
 */
-package assert // import "gotest.tools/assert"
+package assert // import "gotest.tools/v3/assert"
 
 import (
 	"fmt"
diff --git a/assert/cmp/compare.go b/assert/cmp/compare.go
index 5f58acba..bb3b24f4 100644
--- a/assert/cmp/compare.go
+++ b/assert/cmp/compare.go
@@ -1,5 +1,5 @@
 /*Package cmp provides Comparisons for Assert and Check*/
-package cmp // import "gotest.tools/assert/cmp"
+package cmp // import "gotest.tools/v3/assert/cmp"
 
 import (
 	"fmt"
diff --git a/assert/opt/opt.go b/assert/opt/opt.go
index 665eb6f1..357cdf2e 100644
--- a/assert/opt/opt.go
+++ b/assert/opt/opt.go
@@ -1,6 +1,6 @@
 /*Package opt provides common go-cmp.Options for use with assert.DeepEqual.
  */
-package opt // import "gotest.tools/assert/opt"
+package opt // import "gotest.tools/v3/assert/opt"
 
 import (
 	"fmt"
diff --git a/env/env.go b/env/env.go
index 94577f44..7a71acd0 100644
--- a/env/env.go
+++ b/env/env.go
@@ -1,7 +1,7 @@
 /*Package env provides functions to test code that read environment variables
 or the current working directory.
 */
-package env // import "gotest.tools/env"
+package env // import "gotest.tools/v3/env"
 
 import (
 	"os"
diff --git a/fs/file.go b/fs/file.go
index de22d54a..de5f4ec1 100644
--- a/fs/file.go
+++ b/fs/file.go
@@ -1,7 +1,7 @@
 /*Package fs provides tools for creating temporary files, and testing the
 contents and structure of a directory.
 */
-package fs // import "gotest.tools/fs"
+package fs // import "gotest.tools/v3/fs"
 
 import (
 	"io/ioutil"
diff --git a/golden/golden.go b/golden/golden.go
index 4c53c2c5..d585db64 100644
--- a/golden/golden.go
+++ b/golden/golden.go
@@ -5,7 +5,7 @@ Golden files can be automatically updated to match new values by running
 `go test pkgname -test.update-golden`. To ensure the update is correct
 compare the diff of the old expected value to the new expected value.
 */
-package golden // import "gotest.tools/golden"
+package golden // import "gotest.tools/v3/golden"
 
 import (
 	"bytes"
diff --git a/icmd/command.go b/icmd/command.go
index f41eb9d8..3f0c6489 100644
--- a/icmd/command.go
+++ b/icmd/command.go
@@ -1,6 +1,6 @@
 /*Package icmd executes binaries and provides convenient assertions for testing the results.
  */
-package icmd // import "gotest.tools/icmd"
+package icmd // import "gotest.tools/v3/icmd"
 
 import (
 	"bytes"
diff --git a/internal/difflib/difflib.go b/internal/difflib/difflib.go
index b6f486b9..9bf506b6 100644
--- a/internal/difflib/difflib.go
+++ b/internal/difflib/difflib.go
@@ -4,7 +4,7 @@ Original source: https://github.com/pmezard/go-difflib
 
 This file is trimmed to only the parts used by this repository.
 */
-package difflib // import "gotest.tools/internal/difflib"
+package difflib // import "gotest.tools/v3/internal/difflib"
 
 func min(a, b int) int {
 	if a < b {
diff --git a/internal/format/format.go b/internal/format/format.go
index 8f6494f9..5097e4bd 100644
--- a/internal/format/format.go
+++ b/internal/format/format.go
@@ -1,4 +1,4 @@
-package format // import "gotest.tools/internal/format"
+package format // import "gotest.tools/v3/internal/format"
 
 import "fmt"
 
diff --git a/internal/maint/maint.go b/internal/maint/maint.go
index 9db23873..6d6a7cff 100644
--- a/internal/maint/maint.go
+++ b/internal/maint/maint.go
@@ -1,4 +1,4 @@
-package maint // import "gotest.tools/internal/maint"
+package maint // import "gotest.tools/v3/internal/maint"
 
 import (
 	"fmt"
diff --git a/internal/source/source.go b/internal/source/source.go
index 34a77cfe..134afb6b 100644
--- a/internal/source/source.go
+++ b/internal/source/source.go
@@ -1,4 +1,4 @@
-package source // import "gotest.tools/internal/source"
+package source // import "gotest.tools/v3/internal/source"
 
 import (
 	"bytes"
diff --git a/pkg.go b/pkg.go
index c7204103..e7a858ac 100644
--- a/pkg.go
+++ b/pkg.go
@@ -1,4 +1,4 @@
 /*Package gotesttools is a collection of packages to augment `testing` and
 support common patterns.
 */
-package gotesttools // import "gotest.tools"
+package gotesttools // import "gotest.tools/v3"
diff --git a/poll/poll.go b/poll/poll.go
index 5e238dca..b5bd7108 100644
--- a/poll/poll.go
+++ b/poll/poll.go
@@ -1,6 +1,6 @@
 /*Package poll provides tools for testing asynchronous code.
  */
-package poll // import "gotest.tools/poll"
+package poll // import "gotest.tools/v3/poll"
 
 import (
 	"fmt"
diff --git a/skip/skip.go b/skip/skip.go
index 53d1948f..cb899f78 100644
--- a/skip/skip.go
+++ b/skip/skip.go
@@ -1,7 +1,7 @@
 /*Package skip provides functions for skipping a test and printing the source code
 of the condition used to skip the test.
 */
-package skip // import "gotest.tools/skip"
+package skip // import "gotest.tools/v3/skip"
 
 import (
 	"fmt"
diff --git a/x/doc.go b/x/doc.go
index b3f69c34..90f4541f 100644
--- a/x/doc.go
+++ b/x/doc.go
@@ -2,4 +2,4 @@
 compatibility requirements. Packages in this namespace may contain backwards
 incompatible changes within the same major version.
 */
-package x // import "gotest.tools/x"
+package x // import "gotest.tools/v3/x"
diff --git a/x/subtest/context.go b/x/subtest/context.go
index 01a87f41..5750bf40 100644
--- a/x/subtest/context.go
+++ b/x/subtest/context.go
@@ -3,7 +3,7 @@ provides a testing.TB, and context.Context.
 
 This package was inspired by github.com/frankban/quicktest.
 */
-package subtest // import "gotest.tools/x/subtest"
+package subtest // import "gotest.tools/v3/x/subtest"
 
 import (
 	"context"