diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a0dc8ee05f9..ab1ef9fc2ba 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2020-02-29  John David Anglin  <danglin@gcc.gnu.org>
+
+	* testsuite/17_intro/headers/c++1998/charset.cc: Skip on *-*-hpux*.
+	* testsuite/17_intro/headers/c++2011/charset.cc: Likewise.
+	* testsuite/17_intro/headers/c++2014/charset.cc: Likewise.
+	* testsuite/17_intro/headers/c++2017/charset.cc: Likewise.
+	* testsuite/17_intro/headers/c++2020/charset.cc: Likewise.
+
 2020-02-26  Jonathan Wakely  <jwakely@redhat.com>
 
 	Backport from mainline
diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/charset.cc
index 4425e1cf63e..e76edea1559 100644
--- a/libstdc++-v3/testsuite/17_intro/headers/c++1998/charset.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/charset.cc
@@ -1,5 +1,5 @@
 // { dg-options "-finput-charset=ascii" }
 // { dg-do compile }
-// { dg-skip-if "non-ascii in system headers" { *-*-darwin10*  *-*-darwin[89]* } }
+// { dg-skip-if "non-ascii in system headers" { *-*-hpux* *-*-darwin10*  *-*-darwin[89]* } }
 
 #include <bits/extc++.h>
diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2011/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2011/charset.cc
index 4425e1cf63e..e76edea1559 100644
--- a/libstdc++-v3/testsuite/17_intro/headers/c++2011/charset.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2011/charset.cc
@@ -1,5 +1,5 @@
 // { dg-options "-finput-charset=ascii" }
 // { dg-do compile }
-// { dg-skip-if "non-ascii in system headers" { *-*-darwin10*  *-*-darwin[89]* } }
+// { dg-skip-if "non-ascii in system headers" { *-*-hpux* *-*-darwin10*  *-*-darwin[89]* } }
 
 #include <bits/extc++.h>
diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2014/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2014/charset.cc
index 4425e1cf63e..e76edea1559 100644
--- a/libstdc++-v3/testsuite/17_intro/headers/c++2014/charset.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2014/charset.cc
@@ -1,5 +1,5 @@
 // { dg-options "-finput-charset=ascii" }
 // { dg-do compile }
-// { dg-skip-if "non-ascii in system headers" { *-*-darwin10*  *-*-darwin[89]* } }
+// { dg-skip-if "non-ascii in system headers" { *-*-hpux* *-*-darwin10*  *-*-darwin[89]* } }
 
 #include <bits/extc++.h>
diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2017/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2017/charset.cc
index 4425e1cf63e..e76edea1559 100644
--- a/libstdc++-v3/testsuite/17_intro/headers/c++2017/charset.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2017/charset.cc
@@ -1,5 +1,5 @@
 // { dg-options "-finput-charset=ascii" }
 // { dg-do compile }
-// { dg-skip-if "non-ascii in system headers" { *-*-darwin10*  *-*-darwin[89]* } }
+// { dg-skip-if "non-ascii in system headers" { *-*-hpux* *-*-darwin10*  *-*-darwin[89]* } }
 
 #include <bits/extc++.h>
diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2020/charset.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2020/charset.cc
index 4425e1cf63e..e76edea1559 100644
--- a/libstdc++-v3/testsuite/17_intro/headers/c++2020/charset.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/c++2020/charset.cc
@@ -1,5 +1,5 @@
 // { dg-options "-finput-charset=ascii" }
 // { dg-do compile }
-// { dg-skip-if "non-ascii in system headers" { *-*-darwin10*  *-*-darwin[89]* } }
+// { dg-skip-if "non-ascii in system headers" { *-*-hpux* *-*-darwin10*  *-*-darwin[89]* } }
 
 #include <bits/extc++.h>