diff --git a/.travis.yml b/.travis.yml
index 7049d0c..a94053f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ node_js:
   - '0.8'
   - '0.10'
   - '0.11'
+  - 'iojs'
 before_install:
   - sudo chown -R $USER /usr/local
   - sh install
diff --git a/src/CanvasRenderingContext2d.cc b/src/CanvasRenderingContext2d.cc
index 06e4e5a..1844cd9 100755
--- a/src/CanvasRenderingContext2d.cc
+++ b/src/CanvasRenderingContext2d.cc
@@ -23,11 +23,16 @@
 #endif
 
 // Windows doesn't support the C99 names for these
-#ifndef isnan
+#ifdef _MSC_VER
 #define isnan(x) _isnan(x)
 #define isinf(x) (!_finite(x))
 #endif
 
+#ifndef isnan
+#define isnan(x) std::isnan(x)
+#define isinf(x) std::isinf(x)
+#endif
+
 Persistent<FunctionTemplate> Context2d::constructor;
 
 /*