diff --git a/pkg/backup/backup_manager.go b/pkg/backup/backup_manager.go
index a82ae32eb..3c1af3782 100644
--- a/pkg/backup/backup_manager.go
+++ b/pkg/backup/backup_manager.go
@@ -73,7 +73,7 @@ func (bm *BackupManager) SaveSnap(ctx context.Context, s3Path string, isPeriodic
 	}
 	defer rc.Close()
 	if isPeriodic {
-		s3Path = fmt.Sprintf(s3Path+"_v%d_%s", rev, now.Format("2006-01-02-15:04:05"))
+		s3Path = fmt.Sprintf(s3Path+"_v%019d_%s", rev, now.Format("2006-01-02-15:04:05"))
 	}
 	_, err = bm.bw.Write(ctx, s3Path, rc)
 	if err != nil {
diff --git a/pkg/backup/writer/abs_writer.go b/pkg/backup/writer/abs_writer.go
index 743e5b758..eac27e7ed 100644
--- a/pkg/backup/writer/abs_writer.go
+++ b/pkg/backup/writer/abs_writer.go
@@ -103,7 +103,7 @@ func (absw *absWriter) Write(ctx context.Context, path string, r io.Reader) (int
 
 func (absw *absWriter) List(ctx context.Context, basePath string) ([]string, error) {
 	// TODO: support context.
-	container, _, err := util.ParseBucketAndKey(basePath)
+	container, key, err := util.ParseBucketAndKey(basePath)
 	if err != nil {
 		return nil, err
 	}
@@ -118,7 +118,7 @@ func (absw *absWriter) List(ctx context.Context, basePath string) ([]string, err
 	}
 
 	blobs, err := containerRef.ListBlobs(
-		storage.ListBlobsParameters{Prefix: basePath})
+		storage.ListBlobsParameters{Prefix: key})
 	if err != nil {
 		return nil, err
 	}
diff --git a/test/e2e/e2eslow/backup_restore_test.go b/test/e2e/e2eslow/backup_restore_test.go
index b387cc7af..1e9c8cd81 100644
--- a/test/e2e/e2eslow/backup_restore_test.go
+++ b/test/e2e/e2eslow/backup_restore_test.go
@@ -52,7 +52,7 @@ func TestBackupAndRestore(t *testing.T) {
 
 	// Create cluster with TLS
 	f := framework.Global
-	suffix := fmt.Sprintf("%d", rand.Uint64())
+	suffix := fmt.Sprintf("%019d", rand.Uint64())
 	clusterName := "test-etcd-backup-restore-" + suffix
 	memberPeerTLSSecret := "etcd-peer-tls-" + suffix
 	memberClientTLSSecret := "etcd-server-tls-" + suffix