diff --git a/.vintrc.yaml b/.vintrc.yaml
new file mode 100644
index 00000000..ce04d476
--- /dev/null
+++ b/.vintrc.yaml
@@ -0,0 +1,5 @@
+policies:
+  # Disable a violation that is thrown randomly for reasons I still
+  # do not understand.
+  ProhibitMissingScriptEncoding:
+    enabled: false
diff --git a/Dockerfile b/Dockerfile
index 41696a0b..2b626701 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ ENV PACKAGES="\
 RUN apk --update add $PACKAGES && \
     rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
 
-RUN pip install vim-vint==0.3.15
+RUN pip install vim-vint==0.3.21
 
 RUN git clone https://github.com/junegunn/vader.vim vader && \
     cd vader && git checkout c6243dd81c98350df4dec608fa972df98fa2a3af
diff --git a/run-tests b/run-tests
index 21ca5769..6cfa3fae 100755
--- a/run-tests
+++ b/run-tests
@@ -17,7 +17,7 @@ fi
 git_version=$(git describe --always --tags)
 
 # Used in all test scripts for running the selected Docker image.
-DOCKER_RUN_IMAGE="$image"
+DOCKER_RUN_IMAGE="$image:$image_tag"
 export DOCKER_RUN_IMAGE
 
 tests='test/*.vader test/*/*.vader test/*/*/*.vader test/*/*/*.vader'