diff --git a/.travis.yml b/.travis.yml
index c42a84d..e4749d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,41 @@
-dist: bionic
+sudo: false
+group: travis_latest
 language: vim
 
-install:
-  - pwd
+cache:
+  apt: true
+  ccache: true
+
+before_install:
   - git clone https://github.com/junegunn/vader.vim.git tests/vader.vim
-  - git clone https://github.com/vim/vim /tmp/vim
-  - mkdir ~/tmp
-  - cd /tmp/vim
-  - sudo apt-get install -y gettext libncurses5-dev libacl1-dev libgpm-dev
-  - ./configure --with-features=huge --enable-fail-if-missing --enable-pythoninterp --prefix=$HOME/tmp/vim --disable-gui
-  - make && make install
-  - git clone https://github.com/junegunn/vader.vim.git
-  - export VIM_EXE=$HOME/tmp/vim/bin/vim
   - sudo apt-get install python3
   - sudo apt-get install python3-dev
   - sudo apt-get install python3-venv
+
+before_script:
   - cd $HOME/build/heavenshell/vim-pydocstring
   - make install
+  - cd $HOME/build/heavenshell/vim-pydocstring/tests
 
-before_script:
-  - $HOME/tmp/vim/bin/vim --version
+jobs:
+  include:
+  - env: ENV="Vim8"
+    install:
+      - git clone https://github.com/vim/vim /tmp/vim
+      - mkdir ~/tmp
+      - cd /tmp/vim
+      - sudo apt-get install -y gettext libncurses5-dev libacl1-dev libgpm-dev
+      - ./configure --with-features=huge --enable-fail-if-missing --enable-pythoninterp --prefix=$HOME/tmp/vim --disable-gui
+      - make && make install
+
+    script:
+      - VIM_EXE=$HOME/tmp/vim/bin/vim ./run.sh
+
+  - env: ENV="Neovim"
+    install:
+      - mkdir -p ~/tmp/nvim/bin
+      - curl -L https://github.com/neovim/neovim/releases/download/v0.4.3/nvim.appimage -o ~/tmp/nvim/bin/nvim
+      - chmod u+x ~/tmp/nvim/bin/nvim
 
-script:
-  - cd tests
-  - ./run.sh
+    script:
+      - VIM_EXE=$HOME/tmp/nvim/bin/nvim ./run.sh
diff --git a/tests/format.vader b/tests/format.vader
index bb54532..956816f 100644
--- a/tests/format.vader
+++ b/tests/format.vader
@@ -1,6 +1,6 @@
 # vim:set et sw=4 ts=4 tw=79:
 
-Execute (Setup template dir):
+Execute (Setup template formatter):
     Save g:pydocstring_formatter
     let g:pydocstring_formatter = 'sphinx'
 
@@ -18,7 +18,7 @@ Given python (Format all):
 
 Execute:
     :PydocstringFormat
-    :sleep 500m
+    :sleep 1
 
 Expect python:
     class Foo:
diff --git a/tests/google.vader b/tests/google.vader
index b98016a..283b40d 100644
--- a/tests/google.vader
+++ b/tests/google.vader
@@ -1,6 +1,6 @@
 # vim:set et sw=4 ts=4 tw=79:
 
-Execute (Setup template dir):
+Execute (Setup template formatter):
     Save g:pydocstring_formatter
     let g:pydocstring_formatter = 'google'
 
diff --git a/tests/numpy.vader b/tests/numpy.vader
index 77e1b87..14fa3aa 100644
--- a/tests/numpy.vader
+++ b/tests/numpy.vader
@@ -1,6 +1,6 @@
 # vim:set et sw=4 ts=4 tw=79:
 
-Execute (Setup template dir):
+Execute (Setup template formatter):
     Save g:pydocstring_formatter
     let g:pydocstring_formatter = 'numpy'
 
diff --git a/tests/sphinx.vader b/tests/sphinx.vader
index 3776d0d..0f62426 100644
--- a/tests/sphinx.vader
+++ b/tests/sphinx.vader
@@ -1,6 +1,6 @@
 # vim:set et sw=4 ts=4 tw=79:
 
-Execute (Setup template dir):
+Execute (Setup template formatter):
     Save g:pydocstring_formatter
     let g:pydocstring_formatter = 'sphinx'
 
diff --git a/tests/template.vader b/tests/template.vader
index b3364a2..a845ad2 100644
--- a/tests/template.vader
+++ b/tests/template.vader
@@ -1,9 +1,12 @@
 # vim:set et sw=4 ts=4 tw=79:
 
-Execute (Setup template dir):
+Execute (Setup template path):
     Save g:pydocstring_templates_path
     let g:pydocstring_templates_path = './templates'
 
+    Save g:pydocstring_formatter
+    let g:pydocstring_formatter = 'sphinx'
+
 Given python (def foo):
     def foo():
         pass