diff --git a/src/test/regress/sql/comments.sql b/src/test/regress/sql/comments.sql
new file mode 100644
index 0000000000..070917da65
--- /dev/null
+++ b/src/test/regress/sql/comments.sql
@@ -0,0 +1,16 @@
+--
+-- Comments
+--
+
+SELECT 'trailing' AS first; -- trailing single line
+SELECT /* embedded single line */ 'embedded' AS second;
+SELECT /* both embedded and trailing single line */ 'both' AS third; -- trailing single line
+
+SELECT 'before multi-line' AS fourth;
+/* This is an example of SQL which should not execute:
+ * select 'multi-line';
+ */
+SELECT 'after multi-line' AS fifth;
+
+/* and this is the end of the file */
+
diff --git a/src/test/regress/sql/tests b/src/test/regress/sql/tests
index 30d2667625..0e47432c8e 100644
--- a/src/test/regress/sql/tests
+++ b/src/test/regress/sql/tests
@@ -27,6 +27,7 @@ reltime
 abstime
 tinterval
 horology
+comments
 create_function_1
 create_type
 create_table