diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 0fb7370..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-*
-
-!.gitignore
-!.travis.yml
-!CONTRIBUTING.md
-!LICENSE
-!README.md
-!autoload/startify.vim
-!doc/startify.txt
-!plugin/startify.vim
-!startify.png
-!syntax/startify.vim
-!test/run
-!test/tests.vader
-!test/vimrc
diff --git a/.travis.yml b/.travis.yml
index c74f5c8..db900ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,4 +4,11 @@ before_script: |
   git clone https://github.com/junegunn/vader.vim.git
 
 script: |
-  vim -Nu test/vimrc -c 'Vader! test/*' >/dev/null
+  vim -XNu <(cat << EOF
+  filetype off
+  set runtimepath+=vader.vim
+  set runtimepath+=.
+  filetype plugin on
+  syntax enable
+  set hidden
+  EOF) -c 'Vader! test/*' >/dev/null
diff --git a/test/run b/test/run
index 8500a67..d1b0a0e 100755
--- a/test/run
+++ b/test/run
@@ -1,3 +1,12 @@
 #!/usr/bin/env bash
 
-vim -XNu vimrc -c 'Vader! *' >/dev/null
+vader="${HOME}/.vim/*bundle*/vader.vim"
+
+if [ -d $vader ]; then
+    [[ ! -L vader.vim ]] && ln -s $vader
+else
+    git clone https://github.com/junegunn/vader.vim.git
+fi
+
+echo '(Be patient.. testing can take a while.)'
+vim -XNu vimrc -i NONE -c 'Vader! *' >/dev/null
diff --git a/test/tests.vader b/test/tests.vader
index 9bd0151..14c526e 100644
--- a/test/tests.vader
+++ b/test/tests.vader
@@ -24,7 +24,7 @@ Expect (only "bar"):
 
 Given:
   quux
-Do (quit Startify buffer via 'q'):
+Do (quit startify buffer via 'q'):
   q
 Expect:
   quux