diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d183265e72fc..15e276811e15 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2015-12-28  John David Anglin  <danglin@gcc.gnu.org>
 
+	* gfortran.dg/coarray_40.f90: Link with libatomic if available.
+
 	* gcc.dg/pr49551.c: Skip on hppa*-*-hpux*.
 
 	* gcc.dg/torture/pr67609.c: Add -fno-common option on hppa*-*-hpux*.
diff --git a/gcc/testsuite/gfortran.dg/coarray_40.f90 b/gcc/testsuite/gfortran.dg/coarray_40.f90
index 84af50e7dadd..c9ee7d12c4b0 100644
--- a/gcc/testsuite/gfortran.dg/coarray_40.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_40.f90
@@ -1,5 +1,6 @@
 ! { dg-do run }
-! { dg-options "-fcoarray=lib -lcaf_single" }
+! { dg-options "-fcoarray=lib -lcaf_single -latomic" { target libatomic_available } }
+! { dg-options "-fcoarray=lib -lcaf_single" { target { ! libatomic_available } } }
 !
 ! Run-time test for memory consistency
 !