diff --git a/test/e2e/storage/drivers/csi-test/driver/mock.go b/test/e2e/storage/drivers/csi-test/driver/mock.go
index c6560f99ed3..afbdd3fe7b5 100644
--- a/test/e2e/storage/drivers/csi-test/driver/mock.go
+++ b/test/e2e/storage/drivers/csi-test/driver/mock.go
@@ -34,19 +34,6 @@ type MockCSIDriver struct {
 	interceptor grpc.UnaryServerInterceptor
 }
 
-func NewMockCSIDriver(servers *MockCSIDriverServers, interceptor grpc.UnaryServerInterceptor) *MockCSIDriver {
-	return &MockCSIDriver{
-		CSIDriver: CSIDriver{
-			servers: &CSIDriverServers{
-				Controller: servers.Controller,
-				Node:       servers.Node,
-				Identity:   servers.Identity,
-			},
-		},
-		interceptor: interceptor,
-	}
-}
-
 // StartOnAddress starts a new gRPC server listening on given address.
 func (m *MockCSIDriver) StartOnAddress(network, address string) error {
 	l, err := net.Listen(network, address)
diff --git a/test/e2e/storage/drivers/csi-test/mock/service/service.go b/test/e2e/storage/drivers/csi-test/mock/service/service.go
index 2c0928c11a8..798b7c275f1 100644
--- a/test/e2e/storage/drivers/csi-test/mock/service/service.go
+++ b/test/e2e/storage/drivers/csi-test/mock/service/service.go
@@ -113,6 +113,9 @@ type Service interface {
 }
 
 type service struct {
+	csi.UnimplementedControllerServer
+	csi.UnimplementedIdentityServer
+	csi.UnimplementedNodeServer
 	sync.Mutex
 	nodeID       string
 	vols         []csi.Volume