@@ -2,7 +2,7 @@ version: 2
 
 common: &common
   docker:
-    - image: neomake/vims-for-tests:46@sha256:6442e51b531afd2dcf991b19a76aa7fd811b61eed47a0887976d337633526c97
+    - image: neomake/vims-for-tests:47@sha256:b540d84bb5ca445ee28625a5c2f72ce790908a23cd9e6f0b05150840ad15e8b3
   working_directory: ~/repo
   steps:
     - checkout
 
@@ -1,5 +1,5 @@
 # From https://github.com/tweekmonster/vim-testbed.
-FROM testbed/vim:15@sha256:5dcf24ff7e8acce5f04ddc5a1368924877d1508f7408040f7d29eab2906f95d9
+FROM testbed/vim:16@sha256:ce0e3c0407e9af4c41868636199906e3c2a6c6f02b97f6bb3e2767aeba6d5c85
 
 # Currently tested versions:
 #  - v7.3.429 (Ubuntu Precise, 12.04LTS)
@@ -18,7 +18,7 @@ RUN install_vim -tag v8.1.0622 -name vim81 -build \
                 -tag neovim:v0.3.8 -py3 -build \
   && rm -rf /vim-build/**/runtime/tutor
 
-ENV NEOMAKE_DOCKERFILE_UPDATE=2019-09-02
+ENV NEOMAKE_DOCKERFILE_UPDATE=2019-09-19
 
 # Git master in a separate layer, since the above is meant to be stable.
 RUN install_vim -tag master -build \
@@ -52,7 +52,7 @@ RUN chmod +x /usr/local/bin/vimlint
 # Install covimerage and vint.
 RUN apk --no-cache add python3 \
   && pip3 install -U pip \
-  && pip3 install --no-cache-dir python-coveralls covimerage==0.1.6 vim-vint==0.3.21 \
+  && pip3 install --no-cache-dir python-coveralls covimerage==0.1.7 vim-vint==0.3.21 \
   && rm -rf /usr/include /usr/lib/python*/turtle* /usr/lib/python*/tkinter \
   && pip3 uninstall --yes pip \
   && curl https://codecov.io/bash -o /usr/bin/codecov \
 
@@ -183,7 +183,7 @@ vimhelplint: | $(if $(VIMHELPLINT_DIR),,build/vimhelplint)
 
 # Run tests in dockerized Vims.
 DOCKER_REPO:=neomake/vims-for-tests
-DOCKER_TAG:=46
+DOCKER_TAG:=47
 NEOMAKE_DOCKER_IMAGE?=
 DOCKER_IMAGE:=$(if $(NEOMAKE_DOCKER_IMAGE),$(NEOMAKE_DOCKER_IMAGE),$(DOCKER_REPO):$(DOCKER_TAG))
 DOCKER_STREAMS:=-ti
 
@@ -565,7 +565,7 @@ Execute (BufWritePost does not run for unchanged buffer):
   " Every write used to trigger a run (due to b:changedtick being incremented,
   " https://github.com/vim/vim/issues/2764).
   w
-  if has('patch-8.1.1498')
+  if has('patch-8.1.1498') || has('nvim-0.4')
     AssertEqual len(g:neomake_test_jobfinished), 2
   else
     AssertEqual len(g:neomake_test_jobfinished), 3
@@ -598,7 +598,7 @@ Execute (BufWritePost does not run for unchanged buffer (delayed)):
     " Every write used to trigger a run (due to b:changedtick being incremented,
     " https://github.com/vim/vim/issues/2764).
     w
-    if has('patch-8.1.1498')
+    if has('patch-8.1.1498') || has('nvim-0.4')
       let offset_for_unchanged_write = 0
     else
       let offset_for_unchanged_write = 1
 
@@ -7,7 +7,7 @@ Execute (Test Vim's b:changedtick behavior):
   let before = b:changedtick
   exe 'w' tempname()
 
-  if has('patch-8.1.1498')
+  if has('patch-8.1.1498') || has('nvim-0.4')
     let inc_for_unchanged = 0
   else
     let inc_for_unchanged = 1