diff --git a/include/uv.h b/include/uv.h
index 77503bde..61a2c546 100644
--- a/include/uv.h
+++ b/include/uv.h
@@ -43,6 +43,8 @@ extern "C" {
     /* Building static library. */
 #   define UV_EXTERN /* nothing */
 # endif
+#elif defined(__sun)
+# define UV_EXTERN __global
 #elif __GNUC__ >= 4
 # define UV_EXTERN __attribute__((visibility("default")))
 #else
diff --git a/test/test-fs.c b/test/test-fs.c
index f2336e1e..5478a290 100644
--- a/test/test-fs.c
+++ b/test/test-fs.c
@@ -844,7 +844,7 @@ static void check_utime(const char* path,
   } else {
     double st_atim;
     double st_mtim;
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__sun)
     /* TODO(vtjnash): would it be better to normalize this? */
     ASSERT_DOUBLE_GE(s->st_atim.tv_nsec, 0);
     ASSERT_DOUBLE_GE(s->st_mtim.tv_nsec, 0);