diff --git a/test/features/formatter/format.tex b/test/features/formatter/format.tex
deleted file mode 100644
index 8a96140..0000000
--- a/test/features/formatter/format.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\documentclass{minimal}
-\begin{document}
-
-Lorem ipsum dolor sit amet, consetetur sadipscing % a comment
-elitr, sed diam
-nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
-sed diam voluptua. At vero eos et accusam et justo duo dolores et ea
-rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem
-ipsum dolor sit amet.
-
-% Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam
-% nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
-% sed diam voluptua. At vero eos et accusam et justo duo dolores et ea
-% rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem
-% ipsum dolor sit amet.
-
-\end{document}
diff --git a/test/vader/format.vader b/test/vader/format.vader
new file mode 100644
index 0000000..14d1f63
--- /dev/null
+++ b/test/vader/format.vader
@@ -0,0 +1,22 @@
+Execute (Setup):
+  set tw=79
+  let g:vimtex_format_enabled = 1
+
+Given tex (Format inline comment):
+  Lorem ipsum dolor sit amet, consetetur sadipscing % a comment
+  elitr, sed diam
+  nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
+  sed diam voluptua. At vero eos et accusam et justo duo dolores et ea
+  rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem
+  ipsum dolor sit amet.
+
+Do:
+  gqG
+
+Expect tex:
+  Lorem ipsum dolor sit amet, consetetur sadipscing % a comment
+  elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna
+  aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores
+  et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum
+  dolor sit amet.
+