diff --git a/.travis.yml b/.travis.yml
index 37cdad3..3384f24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,20 @@ env:
   matrix:
     - ENV=test
     - ENV=check
+    - ENV=test_nvim
 install:
   - |
     if [ "$ENV" = "test" ]; then
       python3.6 -m pip install pytest
     fi
+  - |
+    # https://github.com/neovim/bot-ci#generated-builds
+    if [ "$ENV" = "test_nvim" ]; then
+      eval "$(curl -Ss https://raw.githubusercontent.com/neovim/bot-ci/master/scripts/travis-setup.sh) nightly-x64"
+      pip --version
+      pip install neovim
+    else
+      vim --version
+    fi
 script:
-  - vim --version
   - make --keep-going "$ENV"
diff --git a/Makefile b/Makefile
index ed049c6..bae7bc4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 test:
 	pytest test_*.py
 
+test_nvim:
+	VSPEC_VIM=nvim pytest test_*.py
+
 build:
 	mkdir $@