diff --git a/tests/metrics/storage/fio-k8s/.gitignore b/tests/metrics/storage/fio-k8s/.gitignore
new file mode 100644
index 0000000000..1caa97b150
--- /dev/null
+++ b/tests/metrics/storage/fio-k8s/.gitignore
@@ -0,0 +1 @@
+./cmd/fiotest/fio-k8s
diff --git a/tests/metrics/storage/fio-k8s/cmd/fiotest/Makefile b/tests/metrics/storage/fio-k8s/cmd/fiotest/Makefile
index 6a31d4ca9e..69888b39d8 100644
--- a/tests/metrics/storage/fio-k8s/cmd/fiotest/Makefile
+++ b/tests/metrics/storage/fio-k8s/cmd/fiotest/Makefile
@@ -15,9 +15,9 @@ run: build
 	$(MKFILE_DIR)/fio-k8s --debug --fio.size 10M --output-dir test-results --test-name runc --container-runtime runc $(MKFILE_DIR)/../../configs/example-config/
 
 gomod:
-	 go mod edit -replace=github.com/kata-containers/tests/metrics/k8s=../../pkg/k8s
-	 go mod edit -replace=github.com/kata-containers/tests/metrics/exec=../../pkg/exec
-	 go mod edit -replace=github.com/kata-containers/tests/metrics/env=../../pkg/env
+	 go mod edit -replace=github.com/kata-containers/kata-containers/tests/metrics/k8s=../../pkg/k8s
+	 go mod edit -replace=github.com/kata-containers/kata-containers/tests/metrics/exec=../../pkg/exec
+	 go mod edit -replace=github.com/kata-containers/kata-containers/tests/metrics/env=../../pkg/env
 	 go mod tidy
 
 runci: build
diff --git a/tests/metrics/storage/fio-k8s/cmd/fiotest/go.mod b/tests/metrics/storage/fio-k8s/cmd/fiotest/go.mod
index bddb4e5480..574b50bcd9 100644
--- a/tests/metrics/storage/fio-k8s/cmd/fiotest/go.mod
+++ b/tests/metrics/storage/fio-k8s/cmd/fiotest/go.mod
@@ -1,12 +1,18 @@
-module github.com/kata-containers/kata-containers/tests/metrics/storage/fio-k8s/cmd/fiotest
+module github.com/kata-containers/kata-containers/tests/metrics/storage/fio-k8s
 
-go 1.19
+go 1.15
 
 require (
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/urfave/cli v1.22.14 // indirect
-	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
+	github.com/kata-containers/kata-containers/tests/metrics/env v0.0.0-00010101000000-000000000000
+	github.com/kata-containers/kata-containers/tests/metrics/exec v0.0.0-00010101000000-000000000000
+	github.com/kata-containers/kata-containers/tests/metrics/k8s v0.0.0-00010101000000-000000000000
+	github.com/pkg/errors v0.9.1
+	github.com/sirupsen/logrus v1.8.1
+	github.com/urfave/cli v1.22.5
 )
+
+replace github.com/kata-containers/kata-containers/tests/metrics/exec => ../../pkg/exec
+
+replace github.com/kata-containers/kata-containers/tests/metrics/k8s => ../../pkg/k8s
+
+replace github.com/kata-containers/kata-containers/tests/metrics/env => ../../pkg/env
diff --git a/tests/metrics/storage/fio-k8s/cmd/fiotest/go.sum b/tests/metrics/storage/fio-k8s/cmd/fiotest/go.sum
index 3155296b0b..9577b966fb 100644
--- a/tests/metrics/storage/fio-k8s/cmd/fiotest/go.sum
+++ b/tests/metrics/storage/fio-k8s/cmd/fiotest/go.sum
@@ -1,27 +1,23 @@
-github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
-github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU=
+github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/tests/metrics/storage/fio-k8s/cmd/fiotest/main.go b/tests/metrics/storage/fio-k8s/cmd/fiotest/main.go
index 041cabce76..641836c556 100644
--- a/tests/metrics/storage/fio-k8s/cmd/fiotest/main.go
+++ b/tests/metrics/storage/fio-k8s/cmd/fiotest/main.go
@@ -13,9 +13,9 @@ import (
 	"strings"
 	"time"
 
-	env "github.com/kata-containers/tests/metrics/env"
-	exec "github.com/kata-containers/tests/metrics/exec"
-	"github.com/kata-containers/tests/metrics/k8s"
+	env "github.com/kata-containers/kata-containers/tests/metrics/env"
+	exec "github.com/kata-containers/kata-containers/tests/metrics/exec"
+	"github.com/kata-containers/kata-containers/tests/metrics/k8s"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
diff --git a/tests/metrics/storage/fio-k8s/pkg/env/Makefile b/tests/metrics/storage/fio-k8s/pkg/env/Makefile
index 01e0d92098..5f0a330df5 100644
--- a/tests/metrics/storage/fio-k8s/pkg/env/Makefile
+++ b/tests/metrics/storage/fio-k8s/pkg/env/Makefile
@@ -5,5 +5,5 @@
 #
 
 gomod:
-	 GO111MODULE=on go mod edit -replace=github.com/kata-containers/tests/metrics/exec=../exec
+	 GO111MODULE=on go mod edit -replace=github.com/kata-containers/kata-containers/tests/metrics/exec=../exec
 	 GO111MODULE=on go mod tidy
diff --git a/tests/metrics/storage/fio-k8s/pkg/env/env.go b/tests/metrics/storage/fio-k8s/pkg/env/env.go
index e5deb29e4a..6ca46ed73c 100644
--- a/tests/metrics/storage/fio-k8s/pkg/env/env.go
+++ b/tests/metrics/storage/fio-k8s/pkg/env/env.go
@@ -5,7 +5,7 @@
 package env
 
 import (
-	exec "github.com/kata-containers/tests/metrics/exec"
+	exec "github.com/kata-containers/kata-containers/tests/metrics/exec"
 )
 
 //logger interface for pkg
diff --git a/tests/metrics/storage/fio-k8s/pkg/env/go.mod b/tests/metrics/storage/fio-k8s/pkg/env/go.mod
new file mode 100644
index 0000000000..6df33edfe4
--- /dev/null
+++ b/tests/metrics/storage/fio-k8s/pkg/env/go.mod
@@ -0,0 +1,10 @@
+module github.com/kata-containers/kata-containers/tests/metrics/storage/fio-k8s/exec
+
+go 1.14
+
+replace github.com/kata-containers/kata-containers/tests/metrics/exec => ../exec
+
+require (
+	github.com/kata-containers/kata-containers/tests/metrics/exec v0.0.0-00010101000000-000000000000
+	github.com/pkg/errors v0.9.1 // indirect
+)
diff --git a/tests/metrics/storage/fio-k8s/pkg/env/go.sum b/tests/metrics/storage/fio-k8s/pkg/env/go.sum
new file mode 100644
index 0000000000..7c401c3f58
--- /dev/null
+++ b/tests/metrics/storage/fio-k8s/pkg/env/go.sum
@@ -0,0 +1,2 @@
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
diff --git a/tests/metrics/storage/fio-k8s/pkg/exec/go.mod b/tests/metrics/storage/fio-k8s/pkg/exec/go.mod
new file mode 100644
index 0000000000..664090f980
--- /dev/null
+++ b/tests/metrics/storage/fio-k8s/pkg/exec/go.mod
@@ -0,0 +1,3 @@
+module github.com/kata-containers/kata-containers/tests/metrics/storage/fio-k8s/exec
+
+go 1.14
diff --git a/tests/metrics/storage/fio-k8s/pkg/k8s/Makefile b/tests/metrics/storage/fio-k8s/pkg/k8s/Makefile
index c596cec7cb..8070ca876d 100644
--- a/tests/metrics/storage/fio-k8s/pkg/k8s/Makefile
+++ b/tests/metrics/storage/fio-k8s/pkg/k8s/Makefile
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 gomod:
-	 GO111MODULE=on go mod edit -replace=github.com/kata-containers/tests/metrics/exec=../exec
+	 GO111MODULE=on go mod edit -replace=github.com/kata-containers/kata-containers/tests/metrics/storage/fio-k8s/pkg/exec=../exec
 	 GO111MODULE=on go mod tidy
diff --git a/tests/metrics/storage/fio-k8s/pkg/k8s/exec.go b/tests/metrics/storage/fio-k8s/pkg/k8s/exec.go
index 1d37a1b875..597e9aaa56 100644
--- a/tests/metrics/storage/fio-k8s/pkg/k8s/exec.go
+++ b/tests/metrics/storage/fio-k8s/pkg/k8s/exec.go
@@ -7,7 +7,7 @@ package k8s
 import (
 	"fmt"
 
-	exec "github.com/kata-containers/tests/metrics/exec"
+	exec "github.com/kata-containers/kata-containers/tests/metrics/storage/fio-k8s/pkg/exec"
 )
 
 type execOpt struct {
diff --git a/tests/metrics/storage/fio-k8s/pkg/k8s/go.mod b/tests/metrics/storage/fio-k8s/pkg/k8s/go.mod
new file mode 100644
index 0000000000..5b8e70d7a1
--- /dev/null
+++ b/tests/metrics/storage/fio-k8s/pkg/k8s/go.mod
@@ -0,0 +1,10 @@
+module github.com/kata-containers/kata-containers/tests/metrics/k8s
+
+go 1.15
+
+replace github.com/kata-containers/kata-containers/tests/metrics/exec => ../exec
+
+require (
+	github.com/kata-containers/kata-containers/tests/metrics/exec v0.0.0-00010101000000-000000000000
+	github.com/pkg/errors v0.9.1
+)
diff --git a/tests/metrics/storage/fio-k8s/pkg/k8s/go.sum b/tests/metrics/storage/fio-k8s/pkg/k8s/go.sum
new file mode 100644
index 0000000000..7c401c3f58
--- /dev/null
+++ b/tests/metrics/storage/fio-k8s/pkg/k8s/go.sum
@@ -0,0 +1,2 @@
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
diff --git a/tests/metrics/storage/fio-k8s/pkg/k8s/k8s.go b/tests/metrics/storage/fio-k8s/pkg/k8s/k8s.go
index 6e1e7a0482..a14cf7b775 100644
--- a/tests/metrics/storage/fio-k8s/pkg/k8s/k8s.go
+++ b/tests/metrics/storage/fio-k8s/pkg/k8s/k8s.go
@@ -7,7 +7,7 @@ package k8s
 import (
 	"fmt"
 
-	exec "github.com/kata-containers/tests/metrics/exec"
+	exec "github.com/kata-containers/kata-containers/tests/metrics/storage/fio-k8s/pkg/exec"
 	"github.com/pkg/errors"
 )