diff --git a/repo/blob/filesystem/filesystem_storage_sync_test.go b/repo/blob/filesystem/filesystem_storage_sync_test.go
index 548f657fc..ba907b733 100644
--- a/repo/blob/filesystem/filesystem_storage_sync_test.go
+++ b/repo/blob/filesystem/filesystem_storage_sync_test.go
@@ -48,12 +48,14 @@ func (vf *verifySyncBeforeCloseFile) Sync() error {
 }
 
 func (vf *verifySyncBeforeCloseFile) Close() error {
-	vf.mu.Lock()
-	defer vf.mu.Unlock()
+	dirty, err := func() (bool, error) {
+		vf.mu.Lock()
+		defer vf.mu.Unlock()
 
-	err := vf.osWriteFile.Close()
+		return vf.dirty, vf.osWriteFile.Close()
+	}()
 
-	if vf.dirty {
+	if dirty {
 		vf.notifyDirtyClose()
 	}