diff --git a/test/link_creation.vader b/test/link_creation.vader
index 83fab66..74f2c86 100644
--- a/test/link_creation.vader
+++ b/test/link_creation.vader
@@ -1,4 +1,4 @@
-Include: vader_setup.vader
+Include: vader_includes/vader_setup.vader
 
 Given vimwiki (Text that is not a wikilink):
   test
@@ -122,4 +122,4 @@ Expect (Mediawiki links):
   [[file.md]]
   [[file.mw]]
 
-Include: vader_teardown.vader
+Include: vader_includes/vader_teardown.vader
diff --git a/test/tabnext_delay.vader b/test/tabnext_delay.vader
index 9186afe..46a8ecc 100644
--- a/test/tabnext_delay.vader
+++ b/test/tabnext_delay.vader
@@ -1,4 +1,4 @@
-Include: vader_setup.vader
+Include: vader_includes/vader_setup.vader
 
 Execute (Set fold method):
   let g:vimwiki_folding = 'expr:quick'
@@ -19,7 +19,6 @@ Execute (Expect < 0.5 second delay: Issue #580):
 
   " cleanup
   bdelete test/resources/delay.wiki
-  tabclose
 
   " verify
   Log 'Elapsed time = ' . string(end)
@@ -29,4 +28,4 @@ Execute (Reset variables):
   let g:vimwiki_folding = ''
   call ReloadVimwiki()
 
-Include: vader_teardown.vader
+Include: vader_includes/vader_teardown.vader
diff --git a/test/vader_setup.vader b/test/vader_includes/vader_setup.vader
similarity index 100%
rename from test/vader_setup.vader
rename to test/vader_includes/vader_setup.vader
diff --git a/test/vader_teardown.vader b/test/vader_includes/vader_teardown.vader
similarity index 100%
rename from test/vader_teardown.vader
rename to test/vader_includes/vader_teardown.vader