diff --git a/tests/cv_traits_test.cpp b/tests/cv_traits_test.cpp
index 3109134..904cef5 100644
--- a/tests/cv_traits_test.cpp
+++ b/tests/cv_traits_test.cpp
@@ -61,14 +61,9 @@ int cpp_main(int argc, char* argv[])
 // define the number of failures expected for given compilers:
 #ifdef BOOST_MSVC
 unsigned int expected_failures = 3;
-#elif defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x530)
+#elif defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x530)
 unsigned int expected_failures = 1;
 #else
 unsigned int expected_failures = 0;
 #endif
 
-
-
-
-
-
diff --git a/tests/is_same_test.cpp b/tests/is_same_test.cpp
index e6f7f2d..fe94135 100644
--- a/tests/is_same_test.cpp
+++ b/tests/is_same_test.cpp
@@ -41,7 +41,7 @@ int cpp_main(int argc, char* argv[])
 #ifdef BOOST_MSVC
 // can't separate void and cv-void:
 unsigned int expected_failures = 1;
-#elif defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x530)
+#elif defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x530)
 unsigned int expected_failures = 2;
 #else
 unsigned int expected_failures = 0;
diff --git a/tests/object_type_traits_test.cpp b/tests/object_type_traits_test.cpp
index c5142bf..e12b279 100644
--- a/tests/object_type_traits_test.cpp
+++ b/tests/object_type_traits_test.cpp
@@ -298,8 +298,10 @@ unsigned int expected_failures = 9;
 #elif defined(__SUNPRO_CC)
 #if (__SUNPRO_CC <= 0x520)
 unsigned int expected_failures = 55;
-#else // (__SUNPRO_CC <= 0x530)
+#elif (__SUNPRO_CC < 0x530)
 unsigned int expected_failures = 25;
+#else
+unsigned int expected_failures = 0;
 #endif
 #elif defined(__MWERKS__)
 unsigned int expected_failures = 10;
@@ -307,15 +309,9 @@ unsigned int expected_failures = 10;
 unsigned int expected_failures = 0;
 #elif defined(__HP_aCC)
 unsigned int expected_failures = 2;
-#elif defined(__EDG_VERSION__) && __EDG_VERSION__ < 245
+#elif defined(__EDG_VERSION__) && __EDG_VERSION__ < 243
 unsigned int expected_failures = 3;
 #else
 unsigned int expected_failures = 0;
 #endif
 
-
-
-
-
-
-
diff --git a/tests/transform_traits_test.cpp b/tests/transform_traits_test.cpp
index b8b6542..eeb740f 100644
--- a/tests/transform_traits_test.cpp
+++ b/tests/transform_traits_test.cpp
@@ -481,7 +481,7 @@ unsigned int expected_failures = 1; // cv-qualified references
 #endif
 #elif defined(__HP_aCC)
 unsigned int expected_failures = 272; // remove_const/remove_volatile/remove_cv don't work
-#elif defined(__EDG_VERSION__) && __EDG_VERSION__ < 245
+#elif defined(__EDG_VERSION__) && __EDG_VERSION__ < 238
 unsigned int expected_failures = 1;
 #else
 unsigned int expected_failures = 0;