diff --git a/.travis.yml b/.travis.yml
index 464d7eaff..68fc2ef52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,8 +29,7 @@ jobs:
     - env: LINT=vimlint VIM=nvim VIM_VERSION=v0.2.0
     - env: LINT=vint-errors VIM=nvim VIM_VERSION=v0.2.0
     - env: LINT=vint VIM=nvim VIM_VERSION=v0.2.0
-    - env: LINT=vader VIM=vim VIM_VERSION=v8.0.0027
-    - env: LINT=vader VIM=nvim VIM_VERSION=v0.2.0
+    - env: LINT=vader
   allow_failures:
     - env: LINT=vimlint VIM=nvim VIM_VERSION=v0.2.0
     - env: LINT=vint VIM=nvim VIM_VERSION=v0.2.0
diff --git a/Makefile b/Makefile
index ffad2b949..17418646d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,5 @@
-DOCKER = docker run -it --rm -v $(PWD):/testplugin -v $(PWD)/test:/test -v $(PWD)/build:/build "spacevim/vims"
-
-ifeq ($(VIM),nvim)
-  DEFAULT_VIM:=$(DOCKER) neovim-stable
-else
-  DEFAULT_VIM:=$(DOCKER) vim8
-endif
-
 test: build/vader | build
-	$(DEFAULT_VIM) -Nu test/vimrc -c 'Vader! test/**'
+	vim -Nu test/vimrc -c 'Vader! test/**'
 
 COVIMERAGE=$(shell command -v covimerage 2>/dev/null || echo build/covimerage/bin/covimerage)