diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 30a52fcdda5a..0297d9369194 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2019-01-04  Jonathan Wakely  <jwakely@redhat.com>
 
+	* testsuite/23_containers/list/61347.cc: Avoid spurious failure when
+	-fno-inline added to test flags.
+
 	* testsuite/21_strings/basic_string/requirements/
 	explicit_instantiation/debug.cc: Remove XFAIL for old ABI.
 
diff --git a/libstdc++-v3/testsuite/23_containers/list/61347.cc b/libstdc++-v3/testsuite/23_containers/list/61347.cc
index 0ae905848ecd..178c306698f9 100644
--- a/libstdc++-v3/testsuite/23_containers/list/61347.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/61347.cc
@@ -42,7 +42,7 @@ void testc(const std::list<short>& l)
 
 int main()
 {
-#if _GLIBCXX_USE_DUAL_ABI
+#if ! __NO_INLINE__
   std::list<short> l;
   testm(l);
   testc(l);