--- a/gcc/testsuite/g++.dg/concepts/expression2.C	Thu Oct 25 07:37:49 2018 +0900
+++ b/gcc/testsuite/g++.dg/concepts/expression2.C	Thu Feb 13 11:34:05 2020 +0900
@@ -1,16 +1,16 @@
-// { dg-do compile { target c++17 } }
+// { dg-do compile { target c++17_only } }
 // { dg-options "-fconcepts" }
 
 template<typename T>
 concept bool C1()
 {
-  return requires (T t) { t.f(); };
+  return requires (T t) { t.f(); }; // { dg-message "in requirements" }
 }
 
 template<typename T>
 concept bool C2()
 {
-  return requires { typename T::type; };
+  return requires { typename T::type; }; // { dg-message "in requirements" }
 }
 
 template<typename T>
@@ -22,7 +22,7 @@
 void f2(T x) { }
 
 // Note that these declarations are private and therefore
-// cannot satisify the constraints.
+// cannot satisfy the constraints.
 class S
 {
   using type = int;
@@ -31,12 +31,12 @@
 
 int main()
 {
-  f1(s); // { dg-error "cannot call" }
+  f1(s); // { dg-error "unsatisfied|private" }
   f2(s); // { dg-error "" }
 
   // When used in non-SFINAE contexts, make sure that we fail
   // the constraint check before emitting the access check
-  // failures. The context is being presented constistently
+  // failures. The context is being presented consistently
   // in both cases.
   static_assert(C1<S>(), ""); // { dg-error "failed" }
   static_assert(C2<S>(), ""); // { dg-error "" }