diff --git a/.travis.yml b/.travis.yml
index 257e5871c..9a7715b1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,7 @@ install:
     elif [ "${LINT#vint}" != "$LINT" ]; then
       virtualenv /tmp/vint && source /tmp/vint/bin/activate && pip install vim-vint
     elif [ "${LINT#vader}" != "$LINT" ]; then
+      git clone --depth=1 https://github.com/Shougo/dein.vim.git ~/.cache/vimfiles/repos/github.com/Shougo/dein.vim
       C_OPTS="--prefix=$DEPS --with-features=huge --disable-gui --enable-pythoninterp"
       (git clone --depth 1 https://github.com/vim/vim /tmp/vim &&
        cd /tmp/vim &&
@@ -44,12 +45,12 @@ script:
   - |
     set -ex
     if [ "$LINT" = "vimlint" ]; then
-      for file in $(find . -name "*.vim");
+      for file in $(git diff --name-only HEAD dev | grep .vim$);
       do
         sh /tmp/vimlint/bin/vimlint.sh -l /tmp/vimlint -p /tmp/vimlparser $file;
       done
     elif [ "$LINT" = "vimlint-errors" ]; then
-      for file in $(find . -name "*.vim");
+      for file in $(git diff --name-only HEAD dev | grep .vim$);
       do
         sh /tmp/vimlint/bin/vimlint.sh -E -l /tmp/vimlint -p /tmp/vimlparser $file;
       done
diff --git a/config/main.vim b/config/main.vim
index 947589258..ad14c4f6c 100644
--- a/config/main.vim
+++ b/config/main.vim
@@ -64,5 +64,4 @@ endif
 call zvim#util#source_rc('commands.vim')
 filetype plugin indent on
 syntax on
-
 " vim:set et sw=2 cc=80:
diff --git a/test/init.vader b/test/init.vader
new file mode 100644
index 000000000..e189b2340
--- /dev/null
+++ b/test/init.vader
@@ -0,0 +1,3 @@
+Execute ( SpaceVim api: vim#buffer open ):
+  source init.vim
+  AssertEqual fnamemodify(g:Config_Main_Home, ':.'), 'config'
diff --git a/test/test.vader b/test/test.vader
deleted file mode 100644
index 740bcfa67..000000000
--- a/test/test.vader
+++ /dev/null
@@ -1,21 +0,0 @@
-Execute (Clear search history):
-  for _ in range(&history)
-    call histdel('/', -1)
-  endfor
-
-Given (Search and destroy):
-  I'm a street walking cheetah with a heart full of napalm
-  I'm a runaway son of the nuclear A-bomb
-  I'm a world's forgotten boy
-  The one who searches and destroys
-
-Do (Searches):
-  /street\<CR>
-  /walking\<CR>
-  /cheetah\<CR>
-  /runaway\<CR>
-  /search\<CR>
-
-Execute (Assertions):
-  Log string(map(range(1, &history), 'histget("/", - v:val)'))
-  AssertEqual 'search', histget('/', -1)