diff --git a/e2e/deployment.go b/e2e/deployment.go
index e2d538a33..b481221c3 100644
--- a/e2e/deployment.go
+++ b/e2e/deployment.go
@@ -18,7 +18,6 @@ package e2e
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"os"
 	"time"
@@ -175,7 +174,7 @@ func waitForDeploymentComplete(clientSet kubernetes.Interface, name, ns string,
 		return false, nil
 	})
 
-	if errors.Is(err, wait.ErrWaitTimeout) {
+	if wait.Interrupted(err) {
 		err = fmt.Errorf("%s", reason)
 	}
 	if err != nil {
diff --git a/e2e/rbd.go b/e2e/rbd.go
index 13146f7d8..eae8ed8c2 100644
--- a/e2e/rbd.go
+++ b/e2e/rbd.go
@@ -18,7 +18,6 @@ package e2e
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -1913,7 +1912,7 @@ var _ = Describe("RBD", func() {
 					return true, nil
 				})
 
-				if errors.Is(err, wait.ErrWaitTimeout) {
+				if wait.Interrupted(err) {
 					framework.Failf("timed out waiting for the rbd-nbd process: %s", reason)
 				}
 				if err != nil {
diff --git a/e2e/rbd_helper.go b/e2e/rbd_helper.go
index 43d8ae32a..c248734dc 100644
--- a/e2e/rbd_helper.go
+++ b/e2e/rbd_helper.go
@@ -19,7 +19,6 @@ package e2e
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"regexp"
 	"strings"
@@ -1052,7 +1051,7 @@ func waitToRemoveImagesFromTrash(f *framework.Framework, poolName string, t int)
 		return false, nil
 	})
 
-	if errors.Is(err, wait.ErrWaitTimeout) {
+	if wait.Interrupted(err) {
 		err = errReason
 	}
 
diff --git a/internal/rbd/rbd_attach.go b/internal/rbd/rbd_attach.go
index 1af3f065b..c8d4701e2 100644
--- a/internal/rbd/rbd_attach.go
+++ b/internal/rbd/rbd_attach.go
@@ -19,7 +19,6 @@ package rbd
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"os"
 	"strconv"
@@ -509,7 +508,7 @@ func waitForrbdImage(ctx context.Context, backoff wait.Backoff, volOptions *rbdV
 		return !used, nil
 	})
 	// return error if rbd image has not become available for the specified timeout
-	if errors.Is(err, wait.ErrWaitTimeout) {
+	if wait.Interrupted(err) {
 		return fmt.Errorf("rbd image %s is still being used", imagePath)
 	}
 	// return error if any other errors were encountered during waiting for the image to become available