diff --git a/autoload/matchup/test.vim b/autoload/matchup/test.vim
index 769ec70..fb58d85 100644
--- a/autoload/matchup/test.vim
+++ b/autoload/matchup/test.vim
@@ -4,6 +4,24 @@
 " Email:      a@normed.space
 "
 
+function! matchup#test#finished() abort " {{{1
+  for l:error in v:errors
+    let l:match = matchlist(l:error, '\(.*\) line \(\d\+\): \(.*\)')
+    let l:file = fnamemodify(l:match[1], ':.')
+    let l:lnum = l:match[2]
+    let l:msg = l:match[3]
+    echo printf("%s:%d: %s\n", l:file, l:lnum, l:msg)
+  endfor
+
+  if len(v:errors) > 0
+    cquit
+  else
+    quitall!
+  endif
+endfunction
+
+" }}}1
+
 function! matchup#test#assert(condition) abort " {{{1
   if a:condition | return 1 | endif
 
diff --git a/test/new/common/bootstrap.vim b/test/new/common/bootstrap.vim
index 1690469..ea68611 100644
--- a/test/new/common/bootstrap.vim
+++ b/test/new/common/bootstrap.vim
@@ -6,9 +6,27 @@ let &rtp = &rtp . ',../../../after'
 profile start /tmp/vim-profile.txt
 profile! file */matchup/*.vim
 
+if has('nvim-0.5.0')
+  let s:path = simplify(expand('<sfile>:h').'/../../..')
+  let &rtp = s:path.'/test/vader/plugged/nvim-treesitter,' . &rtp
+  let &rtp .= ','.s:path.'/test/vader/plugged/nvim-treesitter/after'
+
+  lua <<EOF
+  require'nvim-treesitter.configs'.setup {
+    matchup = {
+      enable = true
+    }
+  }
+EOF
+
+  runtime! plugin/nvim-treesitter.vim
+endif
+
 filetype plugin indent on
 syntax enable
 
+set notimeout
+
 let g:matchup_override_vimtex = 1
 
 runtime! plugin/matchup.vim
diff --git a/test/new/test-treesitter/Makefile b/test/new/test-treesitter/Makefile
new file mode 100644
index 0000000..e52fd6d
--- /dev/null
+++ b/test/new/test-treesitter/Makefile
@@ -0,0 +1,9 @@
+.PHONY: test
+
+MYVIM ?= nvim --headless
+
+INMAKE := 1
+export INMAKE
+
+test:
+	@$(MYVIM) -u test.vim
diff --git a/test/new/test-treesitter/example.py b/test/new/test-treesitter/example.py
new file mode 100644
index 0000000..ffdb30f
--- /dev/null
+++ b/test/new/test-treesitter/example.py
@@ -0,0 +1,13 @@
+def F(x, y):
+  if x == 1:
+    return 1
+  elif x == 2:
+    if y == 5:
+      pass
+    elif y == 7:
+      return 9
+    else:
+      return x
+  else:
+    return 3
+  return 2
diff --git a/test/new/test-treesitter/example.rb b/test/new/test-treesitter/example.rb
new file mode 100644
index 0000000..cff35b1
--- /dev/null
+++ b/test/new/test-treesitter/example.rb
@@ -0,0 +1,5 @@
+unless false
+  return
+else
+  return
+end
diff --git a/test/new/test-treesitter/test.vim b/test/new/test-treesitter/test.vim
new file mode 100644
index 0000000..e8f321f
--- /dev/null
+++ b/test/new/test-treesitter/test.vim
@@ -0,0 +1,35 @@
+set nocompatible
+source ../common/bootstrap.vim
+
+if !has('nvim')
+  finish
+endif
+
+function! s:assert_ts_active()
+  call assert_true(index(
+              \ b:matchup_active_engines.delim_all, 'tree_sitter') > -1)
+endfunction
+
+" python
+silent edit example.py
+
+call s:assert_ts_active()
+
+0go
+norm %
+call assert_equal([3, 10], getcurpos()[1:2])
+norm 2%
+call assert_equal([10, 12], getcurpos()[1:2])
+
+" ruby
+silent edit example.rb
+
+call s:assert_ts_active()
+
+0go
+norm %
+call assert_equal([3, 4], getcurpos()[1:2])
+norm 2%
+call assert_equal([1, 1], getcurpos()[1:2])
+
+call matchup#test#finished()