diff --git a/ncdump/CMakeLists.txt b/ncdump/CMakeLists.txt
index 3cd94b9cf..84c2d0be8 100644
--- a/ncdump/CMakeLists.txt
+++ b/ncdump/CMakeLists.txt
@@ -37,14 +37,7 @@ ADD_EXECUTABLE(nccopy ${nccopy_FILES})
 TARGET_LINK_LIBRARIES(ncdump netcdf ${ALL_TLL_LIBS})
 TARGET_LINK_LIBRARIES(nccopy netcdf ${ALL_TLL_LIBS})
 
-IF(MSVC)
-	SET_TARGET_PROPERTIES(ncdump 
-		PROPERTIES LINK_FLAGS " /NODEFAULTLIB:MSVCRT"
-		)
-	SET_TARGET_PROPERTIES(nccopy
-		PROPERTIES LINK_FLAGS " /NODEFAULTLIB:MSVCRT"
-		)
-ENDIF()
+
 
 IF(ENABLE_TESTS)
 	ADD_EXECUTABLE(rewrite-scalar rewrite-scalar.c)
@@ -124,6 +117,26 @@ IF(ENABLE_TESTS)
 
 ENDIF()
 
+IF(MSVC)
+	SET_TARGET_PROPERTIES(ncdump 
+		PROPERTIES LINK_FLAGS " /NODEFAULTLIB:MSVCRT"
+		)
+	SET_TARGET_PROPERTIES(nccopy
+		PROPERTIES LINK_FLAGS " /NODEFAULTLIB:MSVCRT"
+		)
+
+	IF(ENABLE_TESTS)
+		SET_TARGET_PROPERTIES(ncdump_tst_nans
+			PROPERTIES LINK_FLAGS " /NODEFAULTLIB:MSVCRT"
+		)
+		SET_TARGET_PROPERTIES(ncdump_tst_special_atts
+			PROPERTIES LINK_FLAGS " /NODEFAULTLIB:MSVCRT"
+		)
+	ENDIF()	
+
+ENDIF()
+
+
 INSTALL(TARGETS ncdump DESTINATION bin)
 INSTALL(TARGETS nccopy DESTINATION bin)
 
diff --git a/ncdump/tst_nans.c b/ncdump/tst_nans.c
index 252c43a80..ae319107a 100644
--- a/ncdump/tst_nans.c
+++ b/ncdump/tst_nans.c
@@ -23,7 +23,7 @@
 #define NVALS 3
 #define F_NAME "fvar"
 #define D_NAME "dvar"
-
+#define NC_INFINITE (DBL_MAX+DBL_MAX)
 int
 main(int argc, char **argv)
 {
@@ -31,11 +31,12 @@ main(int argc, char **argv)
     float fvals[NVALS], fvals_in[NVALS];
     double dvals[NVALS], dvals_in[NVALS];
 
-    float fnan = 0.f/0.f;
-    double dnan = 0.0/0.0;
-    float fpinf = 1.0f/0.0f;
+    
+    float fnan = (NC_INFINITE-NC_INFINITE);//0.f/0.f;
+    double dnan = (NC_INFINITE-NC_INFINITE);//0.0/0.0;
+    float fpinf = NC_INFINITE;//1.0f/0.0f;
     float fninf = -fpinf;
-    double dpinf = 1.0/0.0;
+    double dpinf = NC_INFINITE;//1.0/0.0;
     double dninf = -dpinf;
     nc_type att_type;
     size_t att_len;
diff --git a/ncgen/CMakeLists.txt b/ncgen/CMakeLists.txt
index 146f04deb..6120f7c60 100644
--- a/ncgen/CMakeLists.txt
+++ b/ncgen/CMakeLists.txt
@@ -20,7 +20,8 @@ IF(ENABLE_TESTS)
 	add_sh_test(ncgen run_tests)
 	#ADD_TEST(run_ncgen_tests sh ${CMAKE_CURRENT_BINARY_DIR}/run_tests.sh)
 	IF(USE_NETCDF4)
-		ADD_TEST(run_ncgen_nc4_tests sh ${CMAKE_CURRENT_BINARY_DIR}/run_nc4_tests.sh)
+		#ADD_TEST(run_ncgen_nc4_tests sh ${CMAKE_CURRENT_BINARY_DIR}/run_nc4_tests.sh)
+		add_sh_test(ncgen run_ncgen_nc4_tests)
 	ENDIF()
 ENDIF()