diff --git a/carstore/bs.go b/carstore/bs.go
index f907215d..22f2e8b5 100644
--- a/carstore/bs.go
+++ b/carstore/bs.go
@@ -141,6 +141,7 @@ func (uv *userView) prefetchRead(ctx context.Context, k cid.Cid, path string, of
 	if err != nil {
 		return nil, err
 	}
+	defer fi.Close()
 
 	cr, err := car.NewCarReader(fi)
 	if err != nil {
@@ -172,6 +173,7 @@ func (uv *userView) singleRead(ctx context.Context, k cid.Cid, path string, offs
 	if err != nil {
 		return nil, err
 	}
+	defer fi.Close()
 
 	seeked, err := fi.Seek(offset, io.SeekStart)
 	if err != nil {
@@ -386,6 +388,7 @@ func (cs *CarStore) writeShardBlocks(ctx context.Context, sh *CarShard, w io.Wri
 	if err != nil {
 		return err
 	}
+	defer fi.Close()
 
 	_, err = fi.Seek(sh.DataStart, io.SeekStart)
 	if err != nil {
diff --git a/lex/gen.go b/lex/gen.go
index 73b42a91..a57a28cc 100644
--- a/lex/gen.go
+++ b/lex/gen.go
@@ -161,6 +161,7 @@ func ReadSchema(f string) (*Schema, error) {
 	if err != nil {
 		return nil, err
 	}
+    defer fi.Close()
 
 	var s Schema
 	if err := json.NewDecoder(fi).Decode(&s); err != nil {
diff --git a/mst/mst_test.go b/mst/mst_test.go
index 255911e0..8e8ef4c0 100644
--- a/mst/mst_test.go
+++ b/mst/mst_test.go
@@ -120,6 +120,7 @@ func loadCar(bs blockstore.Blockstore, fname string) error {
 	if err != nil {
 		return err
 	}
+	defer fi.Close()
 	br, err := car.NewBlockReader(fi)
 	if err != nil {
 		return err
diff --git a/repo/repo_test.go b/repo/repo_test.go
index 844347e5..64baf1b1 100644
--- a/repo/repo_test.go
+++ b/repo/repo_test.go
@@ -15,6 +15,7 @@ func TestRepo(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer fi.Close()
 
 	ctx := context.TODO()
 	r, err := ReadRepoFromCar(ctx, fi)
diff --git a/repomgr/ingest_test.go b/repomgr/ingest_test.go
index 1ed78fa9..5801c94a 100644
--- a/repomgr/ingest_test.go
+++ b/repomgr/ingest_test.go
@@ -60,6 +60,7 @@ func TestLoadNewRepo(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer fi.Close()
 
 	ctx := context.TODO()
 	if err := repoman.ImportNewRepo(ctx, 2, "", fi, cid.Undef); err != nil {