diff --git a/test/indirect_iter_member_types.cpp b/test/indirect_iter_member_types.cpp
index 82b0e1f..84dcaeb 100644
--- a/test/indirect_iter_member_types.cpp
+++ b/test/indirect_iter_member_types.cpp
@@ -20,6 +20,7 @@ struct zow { };
 
 struct my_ptr {
   typedef zow const element_type;
+  zow const& operator*() const;
 //  typedef const zow& reference;
 //  typedef const zow* pointer;
 //  typedef void difference_type;
diff --git a/test/static_assert_same.hpp b/test/static_assert_same.hpp
index cfc8b61..6df0506 100644
--- a/test/static_assert_same.hpp
+++ b/test/static_assert_same.hpp
@@ -5,35 +5,16 @@
 #ifndef STATIC_ASSERT_SAME_DWA2003530_HPP
 # define STATIC_ASSERT_SAME_DWA2003530_HPP
 
-# include <boost/type.hpp>
-# include <boost/static_assert.hpp>
+#include <boost/mpl/assert.hpp>
+# include <boost/type_traits/is_same.hpp>
 
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-template <class T, class U>
-struct static_assert_same_base;
+#define STATIC_ASSERT_SAME( T1,T2 ) BOOST_MPL_ASSERT((::boost::is_same< T1, T2 >))
 
-template <class T>
-struct static_assert_same_base<T,T>
+template <class T1, class T2>
+struct static_assert_same
 {
+    BOOST_MPL_ASSERT((::boost::is_same< T1, T2 >));
     enum { value = 1 };
 };
 
-template <class T, class U>
-struct static_assert_same : static_assert_same_base<T,U> {};
-
-#else
-# include <boost/mpl/if.hpp>
-# include <boost/mpl/bool.hpp>
-# include <boost/type_traits/is_same.hpp>
-
-template <class T, class U>
-struct static_assert_same
-    : boost::mpl::if_<boost::is_same<T,U>,boost::mpl::true_,void>::type
-{};
-#endif
-
-#define STATIC_ASSERT_SAME( T1,T2 )                   \
-   enum { BOOST_JOIN(boost_static_assert_enum_, __LINE__) \
-          = static_assert_same<T1,T2>::value }
-
 #endif // STATIC_ASSERT_SAME_DWA2003530_HPP