diff --git a/storage/goopicsi_test.go b/storage/goopicsi_test.go
index 4bba0be..4853dbf 100644
--- a/storage/goopicsi_test.go
+++ b/storage/goopicsi_test.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/opiproject/godpu/test/mock-server/server"
-	"github.com/opiproject/godpu/test/mock-server/stub"
+	"github.com/opiproject/godpu/testing/mock-server/server"
+	"github.com/opiproject/godpu/testing/mock-server/stub"
 	pb "github.com/opiproject/opi-api/storage/v1alpha1/gen/go"
 	"github.com/stretchr/testify/suite"
 	"google.golang.org/grpc"
@@ -33,7 +33,7 @@ func RunServer() {
 	fmt.Println("RUNNING MOCK SERVER")
 	const (
 		csiAddress       = "localhost:50051"
-		defaultStubsPath = "../test/mock-server/stubs"
+		defaultStubsPath = "../testing/mock-server/stubs"
 		apiPort          = "4771"
 	)
 
diff --git a/test/mock-server/server/server.go b/testing/mock-server/server/server.go
similarity index 100%
rename from test/mock-server/server/server.go
rename to testing/mock-server/server/server.go
diff --git a/test/mock-server/stub/storage.go b/testing/mock-server/stub/storage.go
similarity index 100%
rename from test/mock-server/stub/storage.go
rename to testing/mock-server/stub/storage.go
diff --git a/test/mock-server/stub/stub.go b/testing/mock-server/stub/stub.go
similarity index 100%
rename from test/mock-server/stub/stub.go
rename to testing/mock-server/stub/stub.go
diff --git a/test/mock-server/stubs/CreateNVMeSubSystem.json b/testing/mock-server/stubs/CreateNVMeSubSystem.json
similarity index 100%
rename from test/mock-server/stubs/CreateNVMeSubSystem.json
rename to testing/mock-server/stubs/CreateNVMeSubSystem.json
diff --git a/test/mock-server/stubs/CreateNVMfRemoteControllers.json b/testing/mock-server/stubs/CreateNVMfRemoteControllers.json
similarity index 100%
rename from test/mock-server/stubs/CreateNVMfRemoteControllers.json
rename to testing/mock-server/stubs/CreateNVMfRemoteControllers.json
diff --git a/test/mock-server/stubs/CreateNamespace.json b/testing/mock-server/stubs/CreateNamespace.json
similarity index 100%
rename from test/mock-server/stubs/CreateNamespace.json
rename to testing/mock-server/stubs/CreateNamespace.json
diff --git a/test/mock-server/stubs/DeleteNamespace.json b/testing/mock-server/stubs/DeleteNamespace.json
similarity index 100%
rename from test/mock-server/stubs/DeleteNamespace.json
rename to testing/mock-server/stubs/DeleteNamespace.json
diff --git a/test/mock-server/stubs/DisconnectConnection.json b/testing/mock-server/stubs/DisconnectConnection.json
similarity index 100%
rename from test/mock-server/stubs/DisconnectConnection.json
rename to testing/mock-server/stubs/DisconnectConnection.json
diff --git a/test/mock-server/stubs/GetNVMeController.json b/testing/mock-server/stubs/GetNVMeController.json
similarity index 100%
rename from test/mock-server/stubs/GetNVMeController.json
rename to testing/mock-server/stubs/GetNVMeController.json
diff --git a/test/mock-server/stubs/GetNVMeSubSystem.json b/testing/mock-server/stubs/GetNVMeSubSystem.json
similarity index 100%
rename from test/mock-server/stubs/GetNVMeSubSystem.json
rename to testing/mock-server/stubs/GetNVMeSubSystem.json
diff --git a/test/mock-server/stubs/GetNVMfRemoteController.json b/testing/mock-server/stubs/GetNVMfRemoteController.json
similarity index 100%
rename from test/mock-server/stubs/GetNVMfRemoteController.json
rename to testing/mock-server/stubs/GetNVMfRemoteController.json
diff --git a/test/mock-server/stubs/ListNVMfRemoteController.json b/testing/mock-server/stubs/ListNVMfRemoteController.json
similarity index 100%
rename from test/mock-server/stubs/ListNVMfRemoteController.json
rename to testing/mock-server/stubs/ListNVMfRemoteController.json
diff --git a/test/mock-server/stubs/NullDebugList.json b/testing/mock-server/stubs/NullDebugList.json
similarity index 100%
rename from test/mock-server/stubs/NullDebugList.json
rename to testing/mock-server/stubs/NullDebugList.json