diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fef42859f256..ce4019198fba 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-11  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/82230
+	* g++.dg/cpp1y/lambda-generic-ice8.C: New.
+
 2017-10-11  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/81299
diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-ice8.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-ice8.C
new file mode 100644
index 000000000000..a39ce44115df
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-ice8.C
@@ -0,0 +1,16 @@
+// PR c++/82230
+// { dg-do compile { target c++14 } }
+
+template <class>
+  struct c
+  {
+    template <class>
+    void f()
+    {
+      [](auto) { auto x = [] {}; }(0);
+    }
+};
+int main()
+{
+  c<int>{}.f<int>();
+}