diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index c501b0fa0..6918a1820 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -386,7 +386,7 @@ end
 ---@param compile_location string
 ---@return string? err
 local function do_compile(logger, repo, cc, compile_location)
-  local args = vim.tbl_flatten(select_compiler_args(repo, cc))
+  local args = vim.iter(select_compiler_args(repo, cc)):flatten():totable()
   local cmd = vim.list_extend({ cc }, args)
 
   logger:info('Compiling parser')
diff --git a/tests/indent/common.lua b/tests/indent/common.lua
index f33a5908b..6add58c7f 100644
--- a/tests/indent/common.lua
+++ b/tests/indent/common.lua
@@ -183,7 +183,7 @@ function Runner:whole_file(dirs, opts)
     assert.is.same(1, vim.fn.isdirectory(dir.filename))
     return dir.filename
   end, dirs)
-  local files = require('nvim-treesitter.compat').flatten(vim.tbl_map(scan_dir, dirs))
+  local files = vim.iter(vim.tbl_map(scan_dir, dirs)):flatten():totable()
   for _, file in ipairs(files) do
     local relpath = Path:new(file):make_relative(self.base_dir.filename)
     self.it(relpath, function()