diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fb4b1bd2db0..0ae3270e1c0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-21  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/70265
+	* g++.dg/cpp1y/constexpr-70265-1.C: New.
+	* g++.dg/cpp1y/constexpr-70265-2.C: Likewise.
+
 2017-05-19  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR libgfortran/80333
diff --git a/gcc/testsuite/g++.dg/cpp1y/constexpr-70265-1.C b/gcc/testsuite/g++.dg/cpp1y/constexpr-70265-1.C
new file mode 100644
index 00000000000..e0fcdfeb693
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/constexpr-70265-1.C
@@ -0,0 +1,13 @@
+// PR c++/70265
+// { dg-do compile { target c++14 } }
+
+constexpr int
+foo (int p)
+{
+  int t = 0;
+  while (1)  // { dg-error "count exceeds" }
+    ;
+  return t;
+}
+
+static_assert (foo (1) == 0, "");  // { dg-error "non-constant" }
diff --git a/gcc/testsuite/g++.dg/cpp1y/constexpr-70265-2.C b/gcc/testsuite/g++.dg/cpp1y/constexpr-70265-2.C
new file mode 100644
index 00000000000..fc360f1a9bb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/constexpr-70265-2.C
@@ -0,0 +1,13 @@
+// PR c++/70265
+// { dg-do compile { target c++14 } }
+
+constexpr int
+foo (int p)
+{
+  int t = 0;
+  while (1)
+    t = 0;  // { dg-error "count exceeds" }
+  return t;
+}
+
+static_assert (foo (1) == 0, "");  // { dg-error "non-constant" }