diff --git a/test/cloning_test.cpp b/test/cloning_test.cpp
index 3e5c2af..38f11a0 100644
--- a/test/cloning_test.cpp
+++ b/test/cloning_test.cpp
@@ -7,8 +7,13 @@
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/workaround.hpp>
 #include <string>
 
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+struct my_tag {};
+#endif
+
 typedef boost::error_info<struct my_tag,int> my_info;
 
 template <class T>
diff --git a/test/diagnostic_information_test.cpp b/test/diagnostic_information_test.cpp
index 596fd56..56be4d8 100644
--- a/test/diagnostic_information_test.cpp
+++ b/test/diagnostic_information_test.cpp
@@ -6,6 +6,11 @@
 #include <boost/exception/diagnostic_information.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/workaround.hpp>
+
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+struct test_tag {};
+#endif
 
 typedef boost::error_info<struct test_tag,int> tag_int;
 
diff --git a/test/errno_test.cpp b/test/errno_test.cpp
index 1d060a8..2a7064c 100644
--- a/test/errno_test.cpp
+++ b/test/errno_test.cpp
@@ -6,8 +6,13 @@
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/workaround.hpp>
 #include <errno.h>
 
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+struct tag_errno {};
+#endif
+
 typedef boost::error_info<struct tag_errno,int> info_errno;
 
 class
diff --git a/test/error_info_test.cpp b/test/error_info_test.cpp
index 557aa8f..7a44ac8 100644
--- a/test/error_info_test.cpp
+++ b/test/error_info_test.cpp
@@ -6,6 +6,7 @@
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/info_tuple.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/workaround.hpp>
 
 struct throws_on_copy;
 struct non_printable { };
@@ -34,6 +35,16 @@ user_data
         }
     };
 
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+struct tag_test_1 {};
+struct tag_test_2 {};
+struct tag_test_3 {};
+struct tag_test_4 {};
+struct tag_test_5 {};
+struct tag_test_6 {};
+struct tag_user_data {};
+#endif
+
 typedef boost::error_info<struct tag_test_1,int> test_1;
 typedef boost::error_info<struct tag_test_2,unsigned int> test_2;
 typedef boost::error_info<struct tag_test_3,float> test_3;
diff --git a/test/unknown_exception_test.cpp b/test/unknown_exception_test.cpp
index 96b525b..d163802 100644
--- a/test/unknown_exception_test.cpp
+++ b/test/unknown_exception_test.cpp
@@ -7,6 +7,11 @@
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/detail/lightweight_test.hpp>
+#include <boost/detail/workaround.hpp>
+
+#if BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
+struct tag_test {};
+#endif
 
 typedef boost::error_info<struct tag_test,int> test;