diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 1423598d189..3b39bb795fc 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2018-07-11  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/86443
+	* testsuite/libgomp.c++/for-15.C (a): Remove unused variable.
+	(results): Make sure the variable is not inside declare target region.
+	(qux): Remove unused function.
+
 2018-07-10  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/86443
diff --git a/libgomp/testsuite/libgomp.c++/for-15.C b/libgomp/testsuite/libgomp.c++/for-15.C
index 5e922acc0fa..d48fa37beb0 100644
--- a/libgomp/testsuite/libgomp.c++/for-15.C
+++ b/libgomp/testsuite/libgomp.c++/for-15.C
@@ -88,10 +88,11 @@ private:
 
 template <typename T> const I<T> &J<T>::begin () { return b; }
 template <typename T> const I<T> &J<T>::end () { return e; }
+#pragma omp end declare target
 
-int a[2000];
 int results[2000];
 
+#pragma omp declare target
 template <typename T>
 void
 baz (I<T> &i)
@@ -109,13 +110,6 @@ baz (int i)
   results[i]++;
 }
 
-void
-qux (I<int> &i)
-{
-  if (*i != 1931)
-    abort ();
-}
-
 void
 f1 (J<int> j)
 {