diff --git a/include/boost/config/stdlib/dinkumware.hpp b/include/boost/config/stdlib/dinkumware.hpp
index b3a92a37..a0ed8702 100644
--- a/include/boost/config/stdlib/dinkumware.hpp
+++ b/include/boost/config/stdlib/dinkumware.hpp
@@ -142,12 +142,9 @@
 //
 #if !defined(_CPPLIB_VER) || _CPPLIB_VER < 610
 #  define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
+#  define BOOST_NO_CXX11_HDR_ATOMIC
 #endif
 
-//  Not present in any version:
-//
-#define BOOST_NO_CXX11_HDR_ATOMIC
-
 #ifdef _CPPLIB_VER
 #  define BOOST_DINKUMWARE_STDLIB _CPPLIB_VER
 #else
diff --git a/test/no_cxx11_hdr_atomic_fail.cpp b/test/no_cxx11_hdr_atomic_fail.cpp
index 9aa880f9..196f47cf 100644
--- a/test/no_cxx11_hdr_atomic_fail.cpp
+++ b/test/no_cxx11_hdr_atomic_fail.cpp
@@ -24,7 +24,7 @@
 #include <boost/config.hpp>
 #include "test.hpp"
 
-#ifdef BOOST_NO_CXX11_ATOMIC_SMART_PTR
+#ifdef BOOST_NO_CXX11_HDR_ATOMIC
 #include "boost_no_cxx11_hdr_atomic.ipp"
 #else
 #error "this file should not compile"
@@ -32,6 +32,6 @@
 
 int main( int, char *[] )
 {
-   return boost_no_cxx11_atomic_smart_ptr::test();
+   return boost_no_cxx11_hdr_atomic::test();
 }
 
diff --git a/test/no_cxx11_hdr_atomic_pass.cpp b/test/no_cxx11_hdr_atomic_pass.cpp
index f82eddef..31f7ed96 100644
--- a/test/no_cxx11_hdr_atomic_pass.cpp
+++ b/test/no_cxx11_hdr_atomic_pass.cpp
@@ -24,14 +24,14 @@
 #include <boost/config.hpp>
 #include "test.hpp"
 
-#ifndef BOOST_NO_CXX11_ATOMIC_SMART_PTR
+#ifndef BOOST_NO_CXX11_HDR_ATOMIC
 #include "boost_no_cxx11_hdr_atomic.ipp"
 #else
-namespace boost_no_cxx11_atomic_smart_ptr = empty_boost;
+namespace boost_no_cxx11_hdr_atomic = empty_boost;
 #endif
 
 int main( int, char *[] )
 {
-   return boost_no_cxx11_atomic_smart_ptr::test();
+   return boost_no_cxx11_hdr_atomic::test();
 }