diff --git a/plugins/csi/client.go b/plugins/csi/client.go
index ea89be8ed..6c9d26c39 100644
--- a/plugins/csi/client.go
+++ b/plugins/csi/client.go
@@ -68,7 +68,7 @@ type CSINodeClient interface {
 	NodeGetCapabilities(ctx context.Context, in *csipbv1.NodeGetCapabilitiesRequest, opts ...grpc.CallOption) (*csipbv1.NodeGetCapabilitiesResponse, error)
 	NodeGetInfo(ctx context.Context, in *csipbv1.NodeGetInfoRequest, opts ...grpc.CallOption) (*csipbv1.NodeGetInfoResponse, error)
 	NodeStageVolume(ctx context.Context, in *csipbv1.NodeStageVolumeRequest, opts ...grpc.CallOption) (*csipbv1.NodeStageVolumeResponse, error)
-	// NodeUnstageVolume(ctx context.Context, in *NodeUnstageVolumeRequest, opts ...grpc.CallOption) (*NodeUnstageVolumeResponse, error)
+	NodeUnstageVolume(ctx context.Context, in *csipbv1.NodeUnstageVolumeRequest, opts ...grpc.CallOption) (*csipbv1.NodeUnstageVolumeResponse, error)
 }
 
 type client struct {
diff --git a/plugins/csi/testing/client.go b/plugins/csi/testing/client.go
index 91de486ae..77d2fd3e0 100644
--- a/plugins/csi/testing/client.go
+++ b/plugins/csi/testing/client.go
@@ -80,10 +80,11 @@ func (c *ControllerClient) ValidateVolumeCapabilities(ctx context.Context, in *c
 
 // NodeClient is a CSI Node client used for testing
 type NodeClient struct {
-	NextErr                  error
-	NextCapabilitiesResponse *csipbv1.NodeGetCapabilitiesResponse
-	NextGetInfoResponse      *csipbv1.NodeGetInfoResponse
-	NextStageVolumeResponse  *csipbv1.NodeStageVolumeResponse
+	NextErr                   error
+	NextCapabilitiesResponse  *csipbv1.NodeGetCapabilitiesResponse
+	NextGetInfoResponse       *csipbv1.NodeGetInfoResponse
+	NextStageVolumeResponse   *csipbv1.NodeStageVolumeResponse
+	NextUnstageVolumeResponse *csipbv1.NodeUnstageVolumeResponse
 }
 
 // NewNodeClient returns a new ControllerClient
@@ -96,6 +97,7 @@ func (f *NodeClient) Reset() {
 	f.NextCapabilitiesResponse = nil
 	f.NextGetInfoResponse = nil
 	f.NextStageVolumeResponse = nil
+	f.NextUnstageVolumeResponse = nil
 }
 
 func (c *NodeClient) NodeGetCapabilities(ctx context.Context, in *csipbv1.NodeGetCapabilitiesRequest, opts ...grpc.CallOption) (*csipbv1.NodeGetCapabilitiesResponse, error) {
@@ -109,3 +111,7 @@ func (c *NodeClient) NodeGetInfo(ctx context.Context, in *csipbv1.NodeGetInfoReq
 func (c *NodeClient) NodeStageVolume(ctx context.Context, in *csipbv1.NodeStageVolumeRequest, opts ...grpc.CallOption) (*csipbv1.NodeStageVolumeResponse, error) {
 	return c.NextStageVolumeResponse, c.NextErr
 }
+
+func (c *NodeClient) NodeUnstageVolume(ctx context.Context, in *csipbv1.NodeUnstageVolumeRequest, opts ...grpc.CallOption) (*csipbv1.NodeUnstageVolumeResponse, error) {
+	return c.NextUnstageVolumeResponse, c.NextErr
+}