diff --git a/clang/test/PCH/pth.c b/clang/test/PCH/pth.c
new file mode 100644
index 000000000000..1262f8aebd70
--- /dev/null
+++ b/clang/test/PCH/pth.c
@@ -0,0 +1,7 @@
+// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-pth -o %t %S/pth.h
+// RUN: %clang_cc1 -triple i386-unknown-unknown -include-pth %t -fsyntax-only %s 2>&1 | FileCheck %s
+
+#error This is the only diagnostic
+
+// CHECK: This is the only diagnostic
+// CHECK: 1 error generated.
\ No newline at end of file
diff --git a/clang/test/PCH/pth.h b/clang/test/PCH/pth.h
new file mode 100644
index 000000000000..9ae7021a5e4a
--- /dev/null
+++ b/clang/test/PCH/pth.h
@@ -0,0 +1,12 @@
+// This case came up when using PTH with Boost (<rdar://problem/8227989>).
+
+# ifndef R8227989_PREPROCESSOR_CONFIG_CONFIG_HPP
+# ifndef R8227989_PP_CONFIG_FLAGS
+# endif
+#
+# ifndef R8227989_PP_CONFIG_ERRORS
+#    ifdef NDEBUG
+#    endif
+# endif
+# endif
+