diff --git a/other/rc.vim b/other/rc.vim
new file mode 100644
index 0000000..5564f51
--- /dev/null
+++ b/other/rc.vim
@@ -0,0 +1,5 @@
+filetype off
+set rtp+=./plugins/vader.vim
+set rtp+=./plugins/nvim-nim
+filetype plugin indent on
+syntax enable
diff --git a/other/run_tests.sh b/other/run_tests.sh
index 9b17312..71c4d2a 100755
--- a/other/run_tests.sh
+++ b/other/run_tests.sh
@@ -1,11 +1,14 @@
 #!/bin/bash
-export NVIM_LISTEN_ADDRESS="/tmp/nvim"
-nvim --headless&
-nvimpid=$!
-sleep 2
-sh -c "py.test -v tests/vim/**.py"
-haderr=$?
-sleep 1
-kill $nvimpid
-wait
-exit $haderr
+
+# Intall plugins
+mkdir plugins
+git clone https://github.com/baabelfish/vader.vim plugins/vader.vim
+git clone https://github.com/baabelfish/nvim-nim plugins/nvim-nim
+
+# Run tests
+nvim -u rc.vim -c 'Vader! tests/**/*.vader'
+err=$?
+if [ "$err" != "0" ]; then
+    cat report.log
+    exit 1
+fi
diff --git a/other/tests/vim/smoke.vader b/other/tests/vim/smoke.vader
new file mode 100644
index 0000000..e5b364f
--- /dev/null
+++ b/other/tests/vim/smoke.vader
@@ -0,0 +1,9 @@
+Do (file):
+  ifoo\<esc>
+
+Expect (else):
+  foo
+
+
+Execute (something):
+  AssertEqual 1, 2