diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6f6554f6864f..68752ca8b40d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2016-08-02  Jonathan Wakely  <jwakely@redhat.com>
 
+	* testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc: Skip
+	test if -flto used.
+
 	* testsuite/lib/libstdc++.exp (v3-build_support): Add -fno-lto to
 	additional flags for compiling libtestc++.a objects.
 
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc
index b8f263f6e73c..1123731e353d 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit-hle.cc
@@ -1,6 +1,7 @@
 // { dg-do compile { target i?86-*-* x86_64-*-* } }
 // { dg-options "-std=gnu++11 -O2 -g0 -fno-exceptions -fno-asynchronous-unwind-tables" }
 // { dg-additional-options "-march=i486" { target ia32 } }
+// { dg-skip-if "scans fail with LTO" { lto } { "-flto" } }
 // { dg-final { scan-assembler-times "xacquire\|\.byte\[^\n\r]*0xf2" 14 } }
 // { dg-final { scan-assembler-times "xrelease\|\.byte\[^\n\r]*0xf3" 14 } }