diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 19ba2355c43..cf78ab458d3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-20  Jonathan Wakely  <jwakely@redhat.com>
+
+	* testsuite/experimental/names.cc: Only include Networking TS headers
+	on targets with the necessary Gthreads support.
+
 2019-05-20  Marek Polacek  <polacek@redhat.com>
 
 	CWG 2094 - volatile scalars are trivially copyable.
diff --git a/libstdc++-v3/testsuite/experimental/names.cc b/libstdc++-v3/testsuite/experimental/names.cc
index 0746ca34e06..233b3487981 100644
--- a/libstdc++-v3/testsuite/experimental/names.cc
+++ b/libstdc++-v3/testsuite/experimental/names.cc
@@ -56,11 +56,13 @@
 #include <experimental/utility>
 #include <experimental/vector>
 // Networking
-#include <experimental/buffer>
-#include <experimental/internet>
-#include <experimental/io_context>
-#include <experimental/net>
-#include <experimental/netfwd>
-#include <experimental/socket>
-#include <experimental/timer>
-#include <experimental/executor>
+#ifdef _GLIBCXX_HAS_GTHREADS
+# include <experimental/buffer>
+# include <experimental/internet>
+# include <experimental/io_context>
+# include <experimental/net>
+# include <experimental/netfwd>
+# include <experimental/socket>
+# include <experimental/timer>
+# include <experimental/executor>
+#endif