diff --git a/test/optional_test_inplace.cpp b/test/optional_test_inplace.cpp
index c6a210c..b0e8285 100644
--- a/test/optional_test_inplace.cpp
+++ b/test/optional_test_inplace.cpp
@@ -60,12 +60,16 @@ int test_main( int, char* [] )
   BOOST_CHECK( opt2 == opt2 ) ;
   BOOST_CHECK( *opt2 == a0 ) ;
 
+#ifndef BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION
+
   opt2 = boost::in_place(a10,a11);
   BOOST_CHECK( *opt2 == a1 ) ;
 
   opt3 = boost::in_place<A>(a10,a11);
   BOOST_CHECK( *opt3 == a1 ) ;
 
+#endif
+
   return 0;
 }
 #else
diff --git a/test/optional_test_ref_fail1.cpp b/test/optional_test_ref_fail1.cpp
index 1842741..b2f9061 100644
--- a/test/optional_test_ref_fail1.cpp
+++ b/test/optional_test_ref_fail1.cpp
@@ -17,8 +17,8 @@
 void optional_reference__test_no_converting_assignment()
 {
   boost::optional<int&> opt ;
-  short v = 1 ;
-  short& r = v ;
+  double v = 1 ;
+  double& r = v ;
   opt = r ;
 }