diff --git a/test/filetype/epuppet.vader b/test/filetype/epuppet.vader
index 67c867a..8abb89f 100644
--- a/test/filetype/epuppet.vader
+++ b/test/filetype/epuppet.vader
@@ -6,7 +6,17 @@ Execute (epuppet test_with_leading_tag):
   edit test/test-files/test_with_leading_tag.epp
   AssertEqual &filetype, 'epuppet'
 
-# TODO: this is passing for nvim but not vim
+# If/when https://github.com/junegunn/vader.vim/pull/201 gets merged into
+# vader.vim, we can use the following to skip the test on vim -- until we
+# actually fix the filetype detection.
+# Until SkipIf gets merged, though we need to keep the test commented out to
+# avoid useless CI failure unrelated to other changes
+#Given:
+#
+#SkipIf (ftdetect/puppet.vim is unable to match filetype with content header):
+#  if !has('nvim')
+#    VaderSkip
+#  endif
 #Execute (epuppet perl with shebang):
 #  edit test/test-files/test_perl_with_shebang.epp
 #  AssertEqual &filetype, 'epuppet'
@@ -28,7 +38,13 @@ Execute (epuppet php with extension):
   AssertEqual &filetype, 'epuppet'
   AssertEqual b:epuppet_subtype, 'php'
 
-# TODO: this is passing for nvim but not vim
+# Same as above
+#Given:
+#
+#SkipIf (ftdetect/puppet.vim is unable match filetype by path):
+#  if !has('nvim')
+#    VaderSkip
+#  endif
 #Execute (epuppet apache conf with path and extension):
 #  edit test/test-files/etc/apache2/test.conf.epp
 #  AssertEqual &filetype, 'epuppet'