diff --git a/test/corpus/code_comment.txt b/test/corpus/code_comment.txt
deleted file mode 100644
index 875c0c4..0000000
--- a/test/corpus/code_comment.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-============
-Code comment
-============
-
-/ Example
-  Continued example
-
-  End of comment
-
----
-
-(source_file
-  (code_comment))
diff --git a/test/corpus/comments.txt b/test/corpus/comments.txt
new file mode 100644
index 0000000..b255c87
--- /dev/null
+++ b/test/corpus/comments.txt
@@ -0,0 +1,55 @@
+============
+Code comment
+============
+
+/ Example
+  Continued example
+
+  End of comment
+
+---
+
+(source_file
+  (code_comment))
+
+============
+HTML comment
+============
+
+/! Example
+  Continued example
+
+  End of comment
+
+---
+
+(source_file
+  (html_comment))
+
+=================================
+HTML conditional comment - broken
+=================================
+
+/[if IE
+  p
+
+---
+
+(source_file
+  (code_comment))
+
+========================
+HTML conditional comment
+========================
+
+/[if IE]
+  p
+
+---
+
+(source_file
+  (html_comment_conditional
+    (html_comment_condition)
+    (nested
+      (element
+        (tag_name)))))
diff --git a/test/corpus/html_comment.txt b/test/corpus/html_comment.txt
deleted file mode 100644
index 5aca9a8..0000000
--- a/test/corpus/html_comment.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-============
-HTML comment
-============
-
-/! Example
-  Continued example
-
-  End of comment
-
----
-
-(source_file
-  (html_comment))
diff --git a/test/corpus/html_conditional_comment.txt b/test/corpus/html_conditional_comment.txt
deleted file mode 100644
index 58334c3..0000000
--- a/test/corpus/html_conditional_comment.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-========================
-HTML conditional comment
-========================
-
-/[if IE]
-  p
-
----
-
-(source_file
-  (html_comment_conditional
-    (html_comment_condition)
-    (nested
-      (element
-        (tag_name)))))
diff --git a/test/corpus/html_conditional_comment_broken.txt b/test/corpus/html_conditional_comment_broken.txt
deleted file mode 100644
index 11ba688..0000000
--- a/test/corpus/html_conditional_comment_broken.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-=================================
-HTML conditional comment - broken
-=================================
-
-/[if IE
-  p
-
----
-
-(source_file
-  (code_comment))