diff --git a/pkg/storage/local/local_test.go b/pkg/storage/local/local_test.go
index 60879506..c2953e75 100644
--- a/pkg/storage/local/local_test.go
+++ b/pkg/storage/local/local_test.go
@@ -1297,6 +1297,24 @@ func TestDedupeLinks(t *testing.T) {
 					So(err, ShouldBeNil)
 				})
 
+				Convey("test RunDedupeForDigest directly, trigger stat error on original blob", func() {
+					// rebuild with dedupe true
+					imgStore := local.NewImageStore(dir, false, storage.DefaultGCDelay,
+						true, true, log, metrics, nil, cacheDriver)
+
+					duplicateBlobs := []string{
+						path.Join(dir, "dedupe1", "blobs", "sha256", blobDigest1),
+						path.Join(dir, "dedupe1", "blobs", "sha256", blobDigest2),
+					}
+
+					// remove original blob so that it can not be statted
+					err := os.Remove(path.Join(dir, "dedupe1", "blobs", "sha256", blobDigest1))
+					So(err, ShouldBeNil)
+
+					err = imgStore.RunDedupeForDigest(godigest.Digest(blobDigest1), true, duplicateBlobs)
+					So(err, ShouldNotBeNil)
+				})
+
 				Convey("Intrerrupt rebuilding and restart, checking idempotency", func() {
 					for i := 0; i < 10; i++ {
 						taskScheduler, cancel := runAndGetScheduler()
diff --git a/pkg/storage/s3/s3_test.go b/pkg/storage/s3/s3_test.go
index 5b1c338e..552d41fd 100644
--- a/pkg/storage/s3/s3_test.go
+++ b/pkg/storage/s3/s3_test.go
@@ -2026,7 +2026,7 @@ func TestRebuildDedupeIndex(t *testing.T) {
 			imgStore.RunDedupeBlobs(time.Duration(0), taskScheduler)
 
 			// wait until rebuild finishes
-			time.Sleep(5 * time.Second)
+			time.Sleep(10 * time.Second)
 
 			cancel()
 
@@ -2068,7 +2068,7 @@ func TestRebuildDedupeIndex(t *testing.T) {
 			imgStore.RunDedupeBlobs(time.Duration(0), taskScheduler)
 
 			// wait until rebuild finishes
-			time.Sleep(5 * time.Second)
+			time.Sleep(10 * time.Second)
 
 			cancel()
 
@@ -2108,7 +2108,7 @@ func TestRebuildDedupeIndex(t *testing.T) {
 			imgStore.RunDedupeBlobs(time.Duration(0), taskScheduler)
 
 			// wait until rebuild finishes
-			time.Sleep(3 * time.Second)
+			time.Sleep(5 * time.Second)
 		})
 
 		Convey("Trigger Stat error while getting original blob", func() {
@@ -2161,7 +2161,7 @@ func TestRebuildDedupeIndex(t *testing.T) {
 			imgStore.RunDedupeBlobs(time.Duration(0), taskScheduler)
 
 			// wait until rebuild finishes
-			time.Sleep(3 * time.Second)
+			time.Sleep(5 * time.Second)
 		})
 
 		Convey("Trigger GetNextDigestWithBlobPaths path not found err", func() {
@@ -2180,7 +2180,7 @@ func TestRebuildDedupeIndex(t *testing.T) {
 			imgStore.RunDedupeBlobs(time.Duration(0), taskScheduler)
 
 			// wait until rebuild finishes
-			time.Sleep(3 * time.Second)
+			time.Sleep(5 * time.Second)
 		})
 
 		Convey("Rebuild from true to false", func() {