diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 79ef76faf7..6d086644a6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-20  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.base/vla-optimized-out.c: Make noclone attribute conditional on
+	NOCLONE macro.
+	* gdb.base/vla-optimized-out.exp: Use additional_flags -DNOCLONE.
+
 2018-07-19  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.mi/list-thread-groups-available.exp (cores_re): Fix quoting in
diff --git a/gdb/testsuite/gdb.base/vla-optimized-out.c b/gdb/testsuite/gdb.base/vla-optimized-out.c
index 913e8ea867..ec0a6fdd80 100644
--- a/gdb/testsuite/gdb.base/vla-optimized-out.c
+++ b/gdb/testsuite/gdb.base/vla-optimized-out.c
@@ -15,7 +15,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-int __attribute__((noinline, noclone))
+int
+#ifdef NOCLONE
+__attribute__((noinline, noclone))
+#else
+__attribute__((noinline))
+#endif
 f1 (int i)
 {
   char a[i + 1];
diff --git a/gdb/testsuite/gdb.base/vla-optimized-out.exp b/gdb/testsuite/gdb.base/vla-optimized-out.exp
index 39abb795c8..b27569ed1e 100644
--- a/gdb/testsuite/gdb.base/vla-optimized-out.exp
+++ b/gdb/testsuite/gdb.base/vla-optimized-out.exp
@@ -18,7 +18,7 @@
 standard_testfile
 
 if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
-	  {debug optimize=-O1}] } {
+	  {debug optimize=-O1 additional_flags=-DNOCLONE}] } {
     return -1
 }