diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6cc3818a316..2741631a4f2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2017-02-07  Dominik Vogt  <vogt@linux.vnet.ibm.com>
+	    Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* g++.dg/tls/thread_local-order2.C: Only xfail execution on
+	*-*-solaris*.
+
 2017-02-07  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/79299
diff --git a/gcc/testsuite/g++.dg/tls/thread_local-order2.C b/gcc/testsuite/g++.dg/tls/thread_local-order2.C
index f8df91737df..117a1d6296b 100644
--- a/gcc/testsuite/g++.dg/tls/thread_local-order2.C
+++ b/gcc/testsuite/g++.dg/tls/thread_local-order2.C
@@ -2,10 +2,11 @@
 // that isn't reverse order of construction.  We need to move
 // __cxa_thread_atexit into glibc to get this right.
 
-// { dg-do run { xfail *-*-* } }
+// { dg-do run }
 // { dg-require-effective-target c++11 }
 // { dg-add-options tls }
 // { dg-require-effective-target tls_runtime }
+// { dg-xfail-run-if "" { *-*-solaris* } }
 
 extern "C" void abort();
 extern "C" int printf (const char *, ...);