diff --git a/test/CodeGenCXX/visibility-hidden-extern-templates.cpp b/test/CodeGenCXX/visibility-hidden-extern-templates.cpp
new file mode 100644
index 0000000..4c133ec
--- /dev/null
+++ b/test/CodeGenCXX/visibility-hidden-extern-templates.cpp
@@ -0,0 +1,26 @@
+// RUN: %clang_cc1 -emit-llvm -o - -fvisibility hidden %s | FileCheck %s
+
+template<typename T>
+struct X {
+  void f();
+  void g() { }
+};
+
+template<typename T> void X<T>::f() { }
+
+extern template struct X<int>;
+template struct X<int>;
+extern template struct X<char>;
+
+// <rdar://problem/8109763>
+void test_X(X<int> xi, X<char> xc) {
+  // CHECK: define weak_odr hidden void @_ZN1XIiE1fEv
+  xi.f();
+  // CHECK: define weak_odr hidden void @_ZN1XIiE1gEv
+  xi.g();
+  // CHECK: declare void @_ZN1XIcE1fEv
+  xc.f();
+  // CHECK: define available_externally void @_ZN1XIcE1gEv
+  xc.g();
+}
+