diff --git a/pkg/nfs/utils.go b/pkg/nfs/utils.go
index 15aed5d9..262b5a9b 100644
--- a/pkg/nfs/utils.go
+++ b/pkg/nfs/utils.go
@@ -116,7 +116,7 @@ func logGRPC(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, h
 }
 
 type VolumeLocks struct {
-	locks sets.String
+	locks sets.String //nolint:staticcheck
 	mux   sync.Mutex
 }
 
diff --git a/test/e2e/testsuites/testsuites.go b/test/e2e/testsuites/testsuites.go
index 8151282f..2052fdd3 100644
--- a/test/e2e/testsuites/testsuites.go
+++ b/test/e2e/testsuites/testsuites.go
@@ -48,13 +48,11 @@ import (
 )
 
 const (
-	execTimeout = 10 * time.Second
 	// Some pods can take much longer to get ready due to volume attach/detach latency.
 	slowPodStartTimeout = 15 * time.Minute
 	// Description that will printed during tests
 	failedConditionDescription = "Error status code"
 	poll                       = 2 * time.Second
-	pollLongTimeout            = 5 * time.Minute
 	pollForStringTimeout       = 1 * time.Minute
 )