diff --git a/test/io/wkt/wkt.cpp b/test/io/wkt/wkt.cpp
index 40fb04acf..dffecb7b1 100644
--- a/test/io/wkt/wkt.cpp
+++ b/test/io/wkt/wkt.cpp
@@ -242,8 +242,8 @@ void test_all()
     test_wrong_wkt<bg::model::box<P> >("BOX(1 1,2 2,3 3)", "box should have 2");
     test_wrong_wkt<bg::model::box<P> >("BOX(1 1,2 2) )", "too much tokens");
 
-    if (boost::is_floating_point<T>::type::value
-        || ! boost::is_fundamental<T>::type::value)
+    if ( BOOST_GEOMETRY_CONDITION(boost::is_floating_point<T>::type::value
+                               || ! boost::is_fundamental<T>::type::value ) )
     {
         test_wkt<P>("POINT(1.1 2.1)", 1);
     }
diff --git a/test/test_geometries/custom_lon_lat_point.hpp b/test/test_geometries/custom_lon_lat_point.hpp
index 7758a1370..1d49dcc00 100644
--- a/test/test_geometries/custom_lon_lat_point.hpp
+++ b/test/test_geometries/custom_lon_lat_point.hpp
@@ -72,14 +72,7 @@ struct access<rw_lon_lat_point<CoordinateType, CoordinateSystem>, Dimension>
     void set(rw_lon_lat_point<CoordinateType, CoordinateSystem>& p,
              CoordinateType const& value)
     {
-        if (Dimension == 0)
-        {
-            p.longitude = value;
-        }
-        else
-        {
-            p.latitude = value;
-        }
+        ( Dimension == 0 ? p.longitude : p.latitude ) = value;
     }
 };