diff --git a/include/boost/config/compiler/borland.hpp b/include/boost/config/compiler/borland.hpp
index 91f064c6..6a7b988d 100644
--- a/include/boost/config/compiler/borland.hpp
+++ b/include/boost/config/compiler/borland.hpp
@@ -66,7 +66,6 @@
 
 // Borland C++ Builder 6 and below:
 #if (__BORLANDC__ <= 0x564)
-#  define BOOST_NO_INTEGRAL_INT64_T
 
 #  ifdef NDEBUG
       // fix broken <cstring> so that Boost.test works:
@@ -121,6 +120,7 @@
 #endif
 
 // Borland C++ Builder 2008 and below:
+#  define BOOST_NO_INTEGRAL_INT64_T
 #  define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
 #  define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS
 #  define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
diff --git a/include/boost/config/compiler/codegear.hpp b/include/boost/config/compiler/codegear.hpp
index 3915cd54..5607156a 100644
--- a/include/boost/config/compiler/codegear.hpp
+++ b/include/boost/config/compiler/codegear.hpp
@@ -30,6 +30,7 @@
 
 // CodeGear C++ Builder 2009
 #if (__CODEGEARC__ <= 0x613)
+#  define BOOST_NO_INTEGRAL_INT64_T
 #  define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
 #  define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS
 #  define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
diff --git a/test/boost_no_integral_int64_t.ipp b/test/boost_no_integral_int64_t.ipp
index 3984808d..eb11640a 100644
--- a/test/boost_no_integral_int64_t.ipp
+++ b/test/boost_no_integral_int64_t.ipp
@@ -43,9 +43,7 @@ __extension__
 
 int test()
 {
-   llt<mask> m;
-   (void)m;
-   return 0;
+   return llt<mask>::value != (1uLL << 50);
 }
 
 }