diff --git a/dev_requirements.txt b/dev_requirements.txt
index e65675c..c7a9ec1 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -1,4 +1,6 @@
 flake8==3.8.3
-vim-vint==0.3.21
 flake8-comprehensions==3.2.3
 flake8-ycm>= 0.1.0
+
+# Use fork of vint which is up to date
+git+https://github.com/puremourning/vint
diff --git a/support/custom_ui_vimrc b/support/custom_ui_vimrc
index bf1f4ec..d319b28 100644
--- a/support/custom_ui_vimrc
+++ b/support/custom_ui_vimrc
@@ -41,7 +41,7 @@ function s:SetUpTerminal()
   let left_bar = 70
   let code = 80
   let padding = 4
-  let cols = max( [ min([ &columns - left_bar - code - padding, 80 ] ), 10 ] )
+  let cols = max( [ min( [ &columns - left_bar - code - padding, 80 ] ), 10 ] )
   call win_gotoid( terminal_win )
   execute cols . 'wincmd |'
 endfunction
diff --git a/tests/lib/plugin/screendump.vim b/tests/lib/plugin/screendump.vim
index 9b823c3..157febd 100644
--- a/tests/lib/plugin/screendump.vim
+++ b/tests/lib/plugin/screendump.vim
@@ -94,7 +94,7 @@ func StopVimInTerminal(buf)
   " In Command-line it's inserted, the CTRL-U removes it again.
   call term_sendkeys(a:buf, "\<C-O>:\<C-U>qa!\<cr>")
 
-  call WaitForAssert({-> assert_equal("finished", term_getstatus(a:buf))})
+  call WaitForAssert({-> assert_equal('finished', term_getstatus(a:buf))})
   only!
 endfunc