diff --git a/storage/remote/read_test.go b/storage/remote/read_test.go
index d63cefc3f..b78a8c621 100644
--- a/storage/remote/read_test.go
+++ b/storage/remote/read_test.go
@@ -475,7 +475,9 @@ func TestSampleAndChunkQueryableClient(t *testing.T) {
 			)
 			q, err := c.Querier(tc.mint, tc.maxt)
 			require.NoError(t, err)
-			defer require.NoError(t, q.Close())
+			defer func() {
+				require.NoError(t, q.Close())
+			}()
 
 			ss := q.Select(context.Background(), true, nil, tc.matchers...)
 			require.NoError(t, err)
diff --git a/tsdb/agent/db_test.go b/tsdb/agent/db_test.go
index b31041b1b..f940e1915 100644
--- a/tsdb/agent/db_test.go
+++ b/tsdb/agent/db_test.go
@@ -640,7 +640,9 @@ func Test_ExistingWAL_NextRef(t *testing.T) {
 	// Create a new storage and see what nextRef is initialized to.
 	db, err = Open(log.NewNopLogger(), nil, rs, dbDir, DefaultOptions())
 	require.NoError(t, err)
-	defer require.NoError(t, db.Close())
+	defer func() {
+		require.NoError(t, db.Close())
+	}()
 
 	require.Equal(t, uint64(seriesCount+histogramCount), db.nextRef.Load(), "nextRef should be equal to the number of series written across the entire WAL")
 }