diff --git a/cmd/restic/integration_test.go b/cmd/restic/integration_test.go
index 1e39301f3..b32d2dc39 100644
--- a/cmd/restic/integration_test.go
+++ b/cmd/restic/integration_test.go
@@ -1760,10 +1760,13 @@ func copyFile(dst string, src string) error {
 		// ignore subsequent errors
 		_ = srcFile.Close()
 		_ = dstFile.Close()
+		return err
 	}
 
 	err = srcFile.Close()
 	if err != nil {
+		// ignore subsequent errors
+		_ = dstFile.Close()
 		return err
 	}
 
diff --git a/internal/backend/rclone/internal_test.go b/internal/backend/rclone/internal_test.go
index a192a37bf..8bc661ab7 100644
--- a/internal/backend/rclone/internal_test.go
+++ b/internal/backend/rclone/internal_test.go
@@ -24,7 +24,8 @@ func TestRcloneExit(t *testing.T) {
 	}
 	rtest.OK(t, err)
 	defer func() {
-		rtest.OK(t, be.Close())
+		// ignore the error as the test will kill rclone (see below)
+		_ = be.Close()
 	}()
 
 	err = be.cmd.Process.Kill()
diff --git a/internal/repository/repository.go b/internal/repository/repository.go
index c21bd520c..a13a0d784 100644
--- a/internal/repository/repository.go
+++ b/internal/repository/repository.go
@@ -420,12 +420,7 @@ func (r *Repository) saveIndex(ctx context.Context, indexes ...*Index) error {
 		debug.Log("Saved index %d as %v", i, sid)
 	}
 
-	err := r.idx.MergeFinalIndexes()
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return r.idx.MergeFinalIndexes()
 }
 
 // SaveIndex saves all new indexes in the backend.