diff --git a/test/vader/indentation.vader b/test/vader/indentation.vader
index 8c8bea5..7a4d6cf 100644
--- a/test/vader/indentation.vader
+++ b/test/vader/indentation.vader
@@ -1,3 +1,7 @@
+Execute (Setup):
+  set shiftwidth=2
+  set expandtab
+
 Given tex (Indent: regular tex):
   \documentclass{minimal}
   \usepackage{amsmath}
diff --git a/test/vader/minivimrc b/test/vader/minivimrc
index d7278ac..a160059 100644
--- a/test/vader/minivimrc
+++ b/test/vader/minivimrc
@@ -7,8 +7,6 @@ syntax enable
 " Personal settings to get consistent results
 set wildmode=longest:full,full
 set wildcharm=<c-z>
-set shiftwidth=2
-set expandtab
 
 let g:tex_flavor = 'latex'
 let g:vimtex_echo_ignore_wait = 1