diff --git a/core/src/layers/complete.rs b/core/src/layers/complete.rs
index 3656accace7..ff6e4ff2d89 100644
--- a/core/src/layers/complete.rs
+++ b/core/src/layers/complete.rs
@@ -522,10 +522,10 @@ where
             Error::new(ErrorKind::Unexpected, "writer has been closed or aborted")
         })?;
 
-        let ret = w.close().await;
+        let ret = w.close().await?;
         self.inner = None;
 
-        ret
+        Ok(ret)
     }
 
     async fn abort(&mut self) -> Result<()> {
diff --git a/core/src/layers/retry.rs b/core/src/layers/retry.rs
index 51f7764c10c..c9152225d2e 100644
--- a/core/src/layers/retry.rs
+++ b/core/src/layers/retry.rs
@@ -838,17 +838,18 @@ mod tests {
 
         fn info(&self) -> Arc<AccessorInfo> {
             let mut am = AccessorInfo::default();
-            am.set_native_capability(Capability {
-                read: true,
-                write: true,
-                write_can_multi: true,
-                delete: true,
-                delete_max_size: Some(10),
-                stat: true,
-                list: true,
-                list_with_recursive: true,
-                ..Default::default()
-            });
+            am.set_scheme(Scheme::Custom("mock"))
+                .set_native_capability(Capability {
+                    read: true,
+                    write: true,
+                    write_can_multi: true,
+                    delete: true,
+                    delete_max_size: Some(10),
+                    stat: true,
+                    list: true,
+                    list_with_recursive: true,
+                    ..Default::default()
+                });
 
             am.into()
         }