move go module to v2

With the advent of Podman 2.0.0 we crossed the magical barrier of go
modules. While we were able to continue importing all packages inside
of the project, the project could not be vendored anymore from the
outside.

Move the go module to new major version and change all imports to
github.com/containers/libpod/v2. The renaming of the imports
was done via gomove [1].

[1] https://github.com/KSubedi/gomove

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

115 files changed, 136 insertions, 136 deletions

diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go
index e9050b53b..327fda0eb 100644
--- a/test/e2e/attach_test.go
+++ b/test/e2e/attach_test.go
@@ -7,7 +7,7 @@ import (
 	"syscall"
 	"time"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go
index 0cf5283ad..3de7e8090 100644
--- a/test/e2e/build_test.go
+++ b/test/e2e/build_test.go
@@ -9,7 +9,7 @@ import (
 	"runtime"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go
index 663205209..10116349a 100644
--- a/test/e2e/checkpoint_test.go
+++ b/test/e2e/checkpoint_test.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/containers/libpod/pkg/criu"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/pkg/criu"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go
index 72387ed8c..b7bc2c7e8 100644
--- a/test/e2e/commit_test.go
+++ b/test/e2e/commit_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index e12edad49..87c476ecc 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -13,10 +13,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/containers/libpod/libpod/define"
-	"github.com/containers/libpod/pkg/inspect"
-	"github.com/containers/libpod/pkg/rootless"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/libpod/define"
+	"github.com/containers/libpod/v2/pkg/inspect"
+	"github.com/containers/libpod/v2/pkg/rootless"
+	. "github.com/containers/libpod/v2/test/utils"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/containers/storage/pkg/stringid"
diff --git a/test/e2e/container_inspect_test.go b/test/e2e/container_inspect_test.go
index 9cbcbbc7c..a10a634e7 100644
--- a/test/e2e/container_inspect_test.go
+++ b/test/e2e/container_inspect_test.go
@@ -3,8 +3,8 @@ package integration
 import (
 	"os"
 
-	"github.com/containers/libpod/pkg/annotations"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/pkg/annotations"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go
index a2ef7eb4a..26da9486d 100644
--- a/test/e2e/containers_conf_test.go
+++ b/test/e2e/containers_conf_test.go
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go
index 3f9b12e0a..86e485859 100644
--- a/test/e2e/cp_test.go
+++ b/test/e2e/cp_test.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/create_staticip_test.go b/test/e2e/create_staticip_test.go
index 693795637..995193a7d 100644
--- a/test/e2e/create_staticip_test.go
+++ b/test/e2e/create_staticip_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"time"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/create_staticmac_test.go b/test/e2e/create_staticmac_test.go
index 6460659f7..93af5ab10 100644
--- a/test/e2e/create_staticmac_test.go
+++ b/test/e2e/create_staticmac_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go
index 44bb5c45f..5f96f96b1 100644
--- a/test/e2e/create_test.go
+++ b/test/e2e/create_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go
index fbbe49eac..f854c667e 100644
--- a/test/e2e/diff_test.go
+++ b/test/e2e/diff_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"sort"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go
index 8c496872f..7f9550255 100644
--- a/test/e2e/events_test.go
+++ b/test/e2e/events_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go
index f44d428d6..5a519413e 100644
--- a/test/e2e/exec_test.go
+++ b/test/e2e/exec_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/exists_test.go b/test/e2e/exists_test.go
index 8f3b371d8..f509bdff6 100644
--- a/test/e2e/exists_test.go
+++ b/test/e2e/exists_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gexec"
diff --git a/test/e2e/export_test.go b/test/e2e/export_test.go
index fb2582796..dda1c5a62 100644
--- a/test/e2e/export_test.go
+++ b/test/e2e/export_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index 7872a9fbf..87dfa8d00 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	"github.com/ghodss/yaml"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go
index f43a4f865..654e99531 100644
--- a/test/e2e/generate_systemd_test.go
+++ b/test/e2e/generate_systemd_test.go
@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/healthcheck_run_test.go b/test/e2e/healthcheck_run_test.go
index d8e3f045f..c92b908be 100644
--- a/test/e2e/healthcheck_run_test.go
+++ b/test/e2e/healthcheck_run_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/history_test.go b/test/e2e/history_test.go
index 231e8b856..3ecee5d49 100644
--- a/test/e2e/history_test.go
+++ b/test/e2e/history_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go
index b6391cebf..89e7d6769 100644
--- a/test/e2e/images_test.go
+++ b/test/e2e/images_test.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	"github.com/docker/go-units"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go
index bceb30f7c..5745f971b 100644
--- a/test/e2e/import_test.go
+++ b/test/e2e/import_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go
index dbdaa05a7..e38ace53f 100644
--- a/test/e2e/info_test.go
+++ b/test/e2e/info_test.go
@@ -7,8 +7,8 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"github.com/containers/libpod/pkg/rootless"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/pkg/rootless"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/init_test.go b/test/e2e/init_test.go
index 721017d0c..1bf07dcc8 100644
--- a/test/e2e/init_test.go
+++ b/test/e2e/init_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go
index 2fad38a36..ef812476f 100644
--- a/test/e2e/inspect_test.go
+++ b/test/e2e/inspect_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/kill_test.go b/test/e2e/kill_test.go
index 3f192fb55..449b6da24 100644
--- a/test/e2e/kill_test.go
+++ b/test/e2e/kill_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go
index b94b6e267..cb1bae16d 100644
--- a/test/e2e/libpod_suite_remote_test.go
+++ b/test/e2e/libpod_suite_remote_test.go
@@ -15,7 +15,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/v2/pkg/rootless"
 	"github.com/onsi/ginkgo"
 )
 
diff --git a/test/e2e/libpod_suite_varlink_test.go b/test/e2e/libpod_suite_varlink_test.go
index 92c815b39..f040f4fea 100644
--- a/test/e2e/libpod_suite_varlink_test.go
+++ b/test/e2e/libpod_suite_varlink_test.go
@@ -14,7 +14,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/v2/pkg/rootless"
 
 	"github.com/onsi/ginkgo"
 )
diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go
index 9a2cee9e1..ba4928234 100644
--- a/test/e2e/load_test.go
+++ b/test/e2e/load_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/login_logout_test.go b/test/e2e/login_logout_test.go
index 66289dfc3..c3b10efe7 100644
--- a/test/e2e/login_logout_test.go
+++ b/test/e2e/login_logout_test.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	"github.com/onsi/ginkgo/config"
 	. "github.com/onsi/gomega"
diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go
index cf69cbd3e..298174a63 100644
--- a/test/e2e/logs_test.go
+++ b/test/e2e/logs_test.go
@@ -6,7 +6,7 @@ import (
 	"os/exec"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gexec"
diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go
index 1137ebe8e..3bee15bd0 100644
--- a/test/e2e/manifest_test.go
+++ b/test/e2e/manifest_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go
index ac52d8c7e..dd74f245e 100644
--- a/test/e2e/mount_test.go
+++ b/test/e2e/mount_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/namespace_test.go b/test/e2e/namespace_test.go
index 88b48cb06..ba8eabb8c 100644
--- a/test/e2e/namespace_test.go
+++ b/test/e2e/namespace_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/negative_test.go b/test/e2e/negative_test.go
index 957609b7e..1deaf1f67 100644
--- a/test/e2e/negative_test.go
+++ b/test/e2e/negative_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go
index 7eccaa9ab..a69004208 100644
--- a/test/e2e/network_create_test.go
+++ b/test/e2e/network_create_test.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	cniversion "github.com/containernetworking/cni/pkg/version"
-	"github.com/containers/libpod/pkg/network"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/pkg/network"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go
index e293876b9..deb537f6f 100644
--- a/test/e2e/network_test.go
+++ b/test/e2e/network_test.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	"github.com/containers/storage/pkg/stringid"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go
index 149a2e28a..e3256b1e5 100644
--- a/test/e2e/pause_test.go
+++ b/test/e2e/pause_test.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containers/libpod/pkg/cgroups"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/pkg/cgroups"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go
index 7fe4ce967..63d5eff21 100644
--- a/test/e2e/play_kube_test.go
+++ b/test/e2e/play_kube_test.go
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"text/template"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go
index 8d07f6290..57737ad59 100644
--- a/test/e2e/pod_create_test.go
+++ b/test/e2e/pod_create_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go
index 9b6f9b657..c0639e5c7 100644
--- a/test/e2e/pod_infra_container_test.go
+++ b/test/e2e/pod_infra_container_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strconv"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_inspect_test.go b/test/e2e/pod_inspect_test.go
index f1acd3750..5e3634435 100644
--- a/test/e2e/pod_inspect_test.go
+++ b/test/e2e/pod_inspect_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_kill_test.go b/test/e2e/pod_kill_test.go
index af3d2af73..8f39f969a 100644
--- a/test/e2e/pod_kill_test.go
+++ b/test/e2e/pod_kill_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_pause_test.go b/test/e2e/pod_pause_test.go
index df6e5482e..192738809 100644
--- a/test/e2e/pod_pause_test.go
+++ b/test/e2e/pod_pause_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_pod_namespaces.go b/test/e2e/pod_pod_namespaces.go
index 806ec3884..f7ffeb7b7 100644
--- a/test/e2e/pod_pod_namespaces.go
+++ b/test/e2e/pod_pod_namespaces.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_prune_test.go b/test/e2e/pod_prune_test.go
index 1711b55d4..21dfe2ebf 100644
--- a/test/e2e/pod_prune_test.go
+++ b/test/e2e/pod_prune_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go
index 8dcaf6af1..83852f278 100644
--- a/test/e2e/pod_ps_test.go
+++ b/test/e2e/pod_ps_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"sort"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_restart_test.go b/test/e2e/pod_restart_test.go
index 72e804353..77a65a922 100644
--- a/test/e2e/pod_restart_test.go
+++ b/test/e2e/pod_restart_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_rm_test.go b/test/e2e/pod_rm_test.go
index d0ece7b53..7395cada7 100644
--- a/test/e2e/pod_rm_test.go
+++ b/test/e2e/pod_rm_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_start_test.go b/test/e2e/pod_start_test.go
index d7d623d6e..371339f51 100644
--- a/test/e2e/pod_start_test.go
+++ b/test/e2e/pod_start_test.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go
index 778b44d1e..6386d7f29 100644
--- a/test/e2e/pod_stats_test.go
+++ b/test/e2e/pod_stats_test.go
@@ -5,8 +5,8 @@ package integration
 import (
 	"os"
 
-	"github.com/containers/libpod/pkg/cgroups"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/pkg/cgroups"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_stop_test.go b/test/e2e/pod_stop_test.go
index 0fe580921..dec59b3db 100644
--- a/test/e2e/pod_stop_test.go
+++ b/test/e2e/pod_stop_test.go
@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/pod_top_test.go b/test/e2e/pod_top_test.go
index de011eda7..f091ca4a2 100644
--- a/test/e2e/pod_top_test.go
+++ b/test/e2e/pod_top_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go
index 5bb86d558..e8541ab71 100644
--- a/test/e2e/port_test.go
+++ b/test/e2e/port_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go
index e77e6dd25..a51b9565c 100644
--- a/test/e2e/prune_test.go
+++ b/test/e2e/prune_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go
index cfc0a415e..3d583bb8c 100644
--- a/test/e2e/ps_test.go
+++ b/test/e2e/ps_test.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	"github.com/docker/go-units"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go
index ac882927f..8110c3ccf 100644
--- a/test/e2e/pull_test.go
+++ b/test/e2e/pull_test.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go
index 0747257be..637838229 100644
--- a/test/e2e/push_test.go
+++ b/test/e2e/push_test.go
@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containers/libpod/pkg/rootless"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/pkg/rootless"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go
index e72a20f2d..e5cab500f 100644
--- a/test/e2e/restart_test.go
+++ b/test/e2e/restart_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"time"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go
index d0dbd527a..7ddfae0cb 100644
--- a/test/e2e/rm_test.go
+++ b/test/e2e/rm_test.go
@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go
index b8cbdc792..73a54039a 100644
--- a/test/e2e/rmi_test.go
+++ b/test/e2e/rmi_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gexec"
diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go
index 14294eeac..43e73fd0a 100644
--- a/test/e2e/run_cgroup_parent_test.go
+++ b/test/e2e/run_cgroup_parent_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_cleanup_test.go b/test/e2e/run_cleanup_test.go
index 99d0d55e5..14cdf21cf 100644
--- a/test/e2e/run_cleanup_test.go
+++ b/test/e2e/run_cleanup_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_cpu_test.go b/test/e2e/run_cpu_test.go
index 29ceb4e67..287d3a2b6 100644
--- a/test/e2e/run_cpu_test.go
+++ b/test/e2e/run_cpu_test.go
@@ -6,8 +6,8 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/containers/libpod/pkg/cgroups"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/pkg/cgroups"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_device_test.go b/test/e2e/run_device_test.go
index eae3f574c..3f6575b9e 100644
--- a/test/e2e/run_device_test.go
+++ b/test/e2e/run_device_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_dns_test.go b/test/e2e/run_dns_test.go
index 02b9ff8d1..408c315fc 100644
--- a/test/e2e/run_dns_test.go
+++ b/test/e2e/run_dns_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go
index b1344a371..c947fa863 100644
--- a/test/e2e/run_entrypoint_test.go
+++ b/test/e2e/run_entrypoint_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_env_test.go b/test/e2e/run_env_test.go
index 2adf21171..f8d0796a7 100644
--- a/test/e2e/run_env_test.go
+++ b/test/e2e/run_env_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_exit_test.go b/test/e2e/run_exit_test.go
index 40731142e..2382fb279 100644
--- a/test/e2e/run_exit_test.go
+++ b/test/e2e/run_exit_test.go
@@ -3,8 +3,8 @@ package integration
 import (
 	"os"
 
-	"github.com/containers/libpod/libpod/define"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/libpod/define"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go
index d60f2a8cd..f0e65a09d 100644
--- a/test/e2e/run_memory_test.go
+++ b/test/e2e/run_memory_test.go
@@ -5,8 +5,8 @@ package integration
 import (
 	"os"
 
-	"github.com/containers/libpod/pkg/cgroups"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/pkg/cgroups"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go
index afba12ccd..dd018b910 100644
--- a/test/e2e/run_networking_test.go
+++ b/test/e2e/run_networking_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go
index c8ba68efc..1c1b5cfbb 100644
--- a/test/e2e/run_ns_test.go
+++ b/test/e2e/run_ns_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go
index bd6a0e036..d7f3233ef 100644
--- a/test/e2e/run_passwd_test.go
+++ b/test/e2e/run_passwd_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_privileged_test.go b/test/e2e/run_privileged_test.go
index f2c424483..2a8ccaf64 100644
--- a/test/e2e/run_privileged_test.go
+++ b/test/e2e/run_privileged_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_restart_test.go b/test/e2e/run_restart_test.go
index 8bbdf2056..e74f1dec8 100644
--- a/test/e2e/run_restart_test.go
+++ b/test/e2e/run_restart_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_seccomp.go b/test/e2e/run_seccomp.go
index dcf938ad6..08d76bbf6 100644
--- a/test/e2e/run_seccomp.go
+++ b/test/e2e/run_seccomp.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_security_labels.go b/test/e2e/run_security_labels.go
index a04bdc739..2f43e7373 100644
--- a/test/e2e/run_security_labels.go
+++ b/test/e2e/run_security_labels.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_selinux_test.go b/test/e2e/run_selinux_test.go
index 358137aa9..15e34888d 100644
--- a/test/e2e/run_selinux_test.go
+++ b/test/e2e/run_selinux_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/opencontainers/selinux/go-selinux"
diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go
index fbdd3acec..03ed6120a 100644
--- a/test/e2e/run_signal_test.go
+++ b/test/e2e/run_signal_test.go
@@ -11,8 +11,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containers/libpod/pkg/rootless"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/pkg/rootless"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"golang.org/x/sys/unix"
diff --git a/test/e2e/run_staticip_test.go b/test/e2e/run_staticip_test.go
index 5ad8f9fb0..4dd6ba65b 100644
--- a/test/e2e/run_staticip_test.go
+++ b/test/e2e/run_staticip_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"time"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index c78c23b1f..fa52d2d05 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -13,8 +13,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containers/libpod/pkg/cgroups"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/pkg/cgroups"
+	. "github.com/containers/libpod/v2/test/utils"
 	"github.com/containers/storage/pkg/stringid"
 	"github.com/mrunalp/fileutils"
 	. "github.com/onsi/ginkgo"
diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go
index be0981408..e48a427d2 100644
--- a/test/e2e/run_userns_test.go
+++ b/test/e2e/run_userns_test.go
@@ -9,7 +9,7 @@ import (
 	"os/user"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go
index 7cd69f738..3963e8133 100644
--- a/test/e2e/run_volume_test.go
+++ b/test/e2e/run_volume_test.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go
index 41d61e9d9..97668f85f 100644
--- a/test/e2e/runlabel_test.go
+++ b/test/e2e/runlabel_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go
index aaa5ae180..1e035c3e5 100644
--- a/test/e2e/save_test.go
+++ b/test/e2e/save_test.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/containers/libpod/pkg/rootless"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/pkg/rootless"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go
index 9ba0241fe..2848e52ce 100644
--- a/test/e2e/search_test.go
+++ b/test/e2e/search_test.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"text/template"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go
index b8198a3a9..761b1c4ca 100644
--- a/test/e2e/start_test.go
+++ b/test/e2e/start_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gexec"
diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go
index d3af44891..3d93cbeaf 100644
--- a/test/e2e/stats_test.go
+++ b/test/e2e/stats_test.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/containers/libpod/pkg/cgroups"
-	. "github.com/containers/libpod/test/utils"
+	"github.com/containers/libpod/v2/pkg/cgroups"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go
index 4ed0b6293..68f76a4e7 100644
--- a/test/e2e/stop_test.go
+++ b/test/e2e/stop_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/system_df_test.go b/test/e2e/system_df_test.go
index bbbdf30b0..d1a43798e 100644
--- a/test/e2e/system_df_test.go
+++ b/test/e2e/system_df_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go
index 63e77af86..3e16e28d8 100644
--- a/test/e2e/system_reset_test.go
+++ b/test/e2e/system_reset_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go
index a35e5113a..fb9e77b3d 100644
--- a/test/e2e/systemd_test.go
+++ b/test/e2e/systemd_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/tag_test.go b/test/e2e/tag_test.go
index 2b513015b..39d0d24db 100644
--- a/test/e2e/tag_test.go
+++ b/test/e2e/tag_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/top_test.go b/test/e2e/top_test.go
index b62d242f1..3c4142e39 100644
--- a/test/e2e/top_test.go
+++ b/test/e2e/top_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/tree_test.go b/test/e2e/tree_test.go
index c445328fa..c4436962f 100644
--- a/test/e2e/tree_test.go
+++ b/test/e2e/tree_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/trust_test.go b/test/e2e/trust_test.go
index 8c97e6b28..6533ffb26 100644
--- a/test/e2e/trust_test.go
+++ b/test/e2e/trust_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/unshare_test.go b/test/e2e/unshare_test.go
index 5f342ffc3..ba8bf5963 100644
--- a/test/e2e/unshare_test.go
+++ b/test/e2e/unshare_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/untag_test.go b/test/e2e/untag_test.go
index 8a1c8091d..9d0959ff8 100644
--- a/test/e2e/untag_test.go
+++ b/test/e2e/untag_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go
index e353b9f97..775be6511 100644
--- a/test/e2e/version_test.go
+++ b/test/e2e/version_test.go
@@ -3,8 +3,8 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
-	"github.com/containers/libpod/version"
+	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/libpod/v2/version"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gexec"
diff --git a/test/e2e/volume_create_test.go b/test/e2e/volume_create_test.go
index 71023f9e2..a734cdc1a 100644
--- a/test/e2e/volume_create_test.go
+++ b/test/e2e/volume_create_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/volume_inspect_test.go b/test/e2e/volume_inspect_test.go
index 5015e0535..d7bdaaccc 100644
--- a/test/e2e/volume_inspect_test.go
+++ b/test/e2e/volume_inspect_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/volume_ls_test.go b/test/e2e/volume_ls_test.go
index 7664e64bb..eb1a9b2b5 100644
--- a/test/e2e/volume_ls_test.go
+++ b/test/e2e/volume_ls_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/volume_prune_test.go b/test/e2e/volume_prune_test.go
index 3049646b0..f7a2b1995 100644
--- a/test/e2e/volume_prune_test.go
+++ b/test/e2e/volume_prune_test.go
@@ -5,7 +5,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/volume_rm_test.go b/test/e2e/volume_rm_test.go
index 742d4e0dc..fd79be126 100644
--- a/test/e2e/volume_rm_test.go
+++ b/test/e2e/volume_rm_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/e2e/wait_test.go b/test/e2e/wait_test.go
index c03116b01..ea693c115 100644
--- a/test/e2e/wait_test.go
+++ b/test/e2e/wait_test.go
@@ -3,7 +3,7 @@ package integration
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/endpoint/commit.go b/test/endpoint/commit.go
index 2a8e365ae..ff671f572 100644
--- a/test/endpoint/commit.go
+++ b/test/endpoint/commit.go
@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/endpoint/endpoint.go b/test/endpoint/endpoint.go
index 20b5c577e..3352f36f2 100644
--- a/test/endpoint/endpoint.go
+++ b/test/endpoint/endpoint.go
@@ -13,8 +13,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containers/libpod/pkg/rootless"
-	iopodman "github.com/containers/libpod/pkg/varlink"
+	"github.com/containers/libpod/v2/pkg/rootless"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
 	. "github.com/onsi/ginkgo"
 	"github.com/onsi/gomega/gexec"
 )
diff --git a/test/endpoint/exists_test.go b/test/endpoint/exists_test.go
index 17e0fcab4..4278f2bfd 100644
--- a/test/endpoint/exists_test.go
+++ b/test/endpoint/exists_test.go
@@ -5,7 +5,7 @@ package endpoint
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/endpoint/pull_test.go b/test/endpoint/pull_test.go
index 25141d787..06813125e 100644
--- a/test/endpoint/pull_test.go
+++ b/test/endpoint/pull_test.go
@@ -5,7 +5,7 @@ package endpoint
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/endpoint/setup.go b/test/endpoint/setup.go
index c05cc0cbb..f784e5696 100644
--- a/test/endpoint/setup.go
+++ b/test/endpoint/setup.go
@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containers/libpod/pkg/rootless"
-	iopodman "github.com/containers/libpod/pkg/varlink"
+	"github.com/containers/libpod/v2/pkg/rootless"
+	iopodman "github.com/containers/libpod/v2/pkg/varlink"
 	"github.com/containers/storage/pkg/stringid"
 	"github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
diff --git a/test/endpoint/version_test.go b/test/endpoint/version_test.go
index 403fca555..90f2c7043 100644
--- a/test/endpoint/version_test.go
+++ b/test/endpoint/version_test.go
@@ -5,8 +5,8 @@ package endpoint
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
-	"github.com/containers/libpod/version"
+	. "github.com/containers/libpod/v2/test/utils"
+	"github.com/containers/libpod/v2/version"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/utils/common_function_test.go b/test/utils/common_function_test.go
index 46cce1076..c08877204 100644
--- a/test/utils/common_function_test.go
+++ b/test/utils/common_function_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"strings"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
diff --git a/test/utils/podmansession_test.go b/test/utils/podmansession_test.go
index de8c20b24..fa0b6ec50 100644
--- a/test/utils/podmansession_test.go
+++ b/test/utils/podmansession_test.go
@@ -1,7 +1,7 @@
 package utils_test
 
 import (
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/utils/podmantest_test.go b/test/utils/podmantest_test.go
index 387c8747c..f4d994c3d 100644
--- a/test/utils/podmantest_test.go
+++ b/test/utils/podmantest_test.go
@@ -3,7 +3,7 @@ package utils_test
 import (
 	"os"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
diff --git a/test/utils/utils_suite_test.go b/test/utils/utils_suite_test.go
index 0cfa00e9c..a8a5c6e93 100644
--- a/test/utils/utils_suite_test.go
+++ b/test/utils/utils_suite_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	. "github.com/containers/libpod/test/utils"
+	. "github.com/containers/libpod/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"