diff --git a/test/TableGen/CStyleComment.td b/test/TableGen/CStyleComment.td
new file mode 100644
index 00000000000..703ae6837eb
--- /dev/null
+++ b/test/TableGen/CStyleComment.td
@@ -0,0 +1,14 @@
+// Test that multiline, nested, comments work correctly.
+//
+// RUN: tblgen < %s
+
+/* Foo
+  bar
+  /* 
+  blah
+  */
+
+  stuff
+  */
+
+def x;
diff --git a/test/TableGen/Makefile b/test/TableGen/Makefile
new file mode 100644
index 00000000000..c254d809bf8
--- /dev/null
+++ b/test/TableGen/Makefile
@@ -0,0 +1,10 @@
+
+LEVEL = ../../..
+include $(LEVEL)/test/Makefile.tests
+
+TESTS := $(wildcard *.td)
+
+all:: $(addprefix Output/, $(TESTS:%=%.out))
+
+Output/%.out: % Output/.dir $(TBLGEN)
+	-$(TESTRUNR) $<
diff --git a/test/TableGen/UnterminatedComment.td b/test/TableGen/UnterminatedComment.td
new file mode 100644
index 00000000000..7f449c4f8e5
--- /dev/null
+++ b/test/TableGen/UnterminatedComment.td
@@ -0,0 +1,6 @@
+// RUN: not tblgen < %s
+
+def x;
+
+/*  /* /* */
+