diff --git a/test/e2e/storage/drivers/csi-test/mock/service/controller.go b/test/e2e/storage/drivers/csi-test/mock/service/controller.go
index 21fd2edc03c..7ff84d643b4 100644
--- a/test/e2e/storage/drivers/csi-test/mock/service/controller.go
+++ b/test/e2e/storage/drivers/csi-test/mock/service/controller.go
@@ -18,7 +18,6 @@ package service
 
 import (
 	"fmt"
-	"math"
 	"path"
 	"reflect"
 	"strconv"
@@ -412,8 +411,8 @@ func (s *service) ListVolumes(
 		if err != nil {
 			return nil, status.Errorf(
 				codes.Aborted,
-				"startingToken=%d !< int32=%d",
-				startingToken, math.MaxUint32)
+				"startingToken=%s: %v",
+				v, err)
 		}
 		startingToken = int32(i)
 	}
@@ -801,8 +800,8 @@ func getAllSnapshots(s *service, req *csi.ListSnapshotsRequest) (*csi.ListSnapsh
 		if err != nil {
 			return nil, status.Errorf(
 				codes.Aborted,
-				"startingToken=%d !< int32=%d",
-				startingToken, math.MaxUint32)
+				"startingToken=%s: %v",
+				v, err)
 		}
 		startingToken = int32(i)
 	}