diff --git a/src/test/auxiliary/thread-local-extern-static.rs b/src/test/auxiliary/thread-local-extern-static.rs
new file mode 100644
index 00000000000..7a64b32e72a
--- /dev/null
+++ b/src/test/auxiliary/thread-local-extern-static.rs
@@ -0,0 +1,2 @@
+#[thread_local]
+pub static FOO: u32 = 3;
diff --git a/src/test/run-pass/thread-local-extern-static.rs b/src/test/run-pass/thread-local-extern-static.rs
new file mode 100644
index 00000000000..f6f323534b6
--- /dev/null
+++ b/src/test/run-pass/thread-local-extern-static.rs
@@ -0,0 +1,10 @@
+extern crate thread_local_extern_static;
+
+extern {
+    #[thread_local]
+    static FOO: u32;
+}
+
+fn main() {
+    assert_eq!(FOO, 3);
+}