diff --git a/src/test/auxiliary/thread-local-extern-static.rs b/src/test/auxiliary/thread-local-extern-static.rs
index e15546db9700d..d1971a5e1aea4 100644
--- a/src/test/auxiliary/thread-local-extern-static.rs
+++ b/src/test/auxiliary/thread-local-extern-static.rs
@@ -9,8 +9,9 @@
 // except according to those terms.
 
 #![feature(thread_local)]
+#![feature(cfg_target_thread_local)]
 #![crate_type = "lib"]
 
 #[no_mangle]
-#[thread_local]
+#[cfg_attr(target_thread_local, 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
index 5b5c35382e9b3..f80057b0024b5 100644
--- a/src/test/run-pass/thread-local-extern-static.rs
+++ b/src/test/run-pass/thread-local-extern-static.rs
@@ -11,11 +11,12 @@
 // aux-build:thread-local-extern-static.rs
 
 #![feature(thread_local)]
+#![feature(cfg_target_thread_local)]
 
 extern crate thread_local_extern_static;
 
 extern {
-    #[thread_local]
+    #[cfg_attr(target_thread_local, thread_local)]
     static FOO: u32;
 }