diff --git a/test_conformance/compatibility/test_common/harness/compat.h b/test_conformance/compatibility/test_common/harness/compat.h
index d177f87a..608dc95e 100644
--- a/test_conformance/compatibility/test_common/harness/compat.h
+++ b/test_conformance/compatibility/test_common/harness/compat.h
@@ -188,6 +188,10 @@ long double remquol( long double x, long double y, int *quo);
 
 long double scalblnl(long double x, long n);
 
+// snprintf added in _MSC_VER == 1900 (Visual Studio 2015)
+#if defined( _MSC_VER ) && _MSC_VER < 1900
+	#define snprintf   sprintf_s
+#endif
 float hypotf(float x, float y);
 long double hypotl(long double x, long double y) ;
 double lgamma(double x);
@@ -215,7 +219,10 @@ long double roundl(long double x);
         int cf_signbit(double x);
         int cf_signbitf(float x);
 
+// Added in _MSC_VER == 1800 (Visual Studio 2013)
+#if defined( _MSC_VER ) && _MSC_VER < 1800
         static int signbit(double x) { return  cf_signbit(x); }
+#endif
         static int signbitf(float x) { return cf_signbitf(x); }
 
 long int lrint (double flt);
@@ -249,10 +256,6 @@ int32_t float2int (float   fx);
 // stdio.h
 //
 
-#if defined( _MSC_VER )
-    #define snprintf   sprintf_s
-#endif
-
 
 
 //
diff --git a/test_conformance/compatibility/test_common/harness/msvc9.c b/test_conformance/compatibility/test_common/harness/msvc9.c
index 093bb978..cf32b673 100644
--- a/test_conformance/compatibility/test_common/harness/msvc9.c
+++ b/test_conformance/compatibility/test_common/harness/msvc9.c
@@ -565,7 +565,7 @@ long int lrintf (float x)
 //                  fenv functions
 //
 ///////////////////////////////////////////////////////////////////
-
+#if _MSC_VER < 1900
 int fetestexcept(int excepts)
 {
     unsigned int status = _statusfp();
@@ -583,6 +583,7 @@ int feclearexcept(int excepts)
     _clearfp();
     return 0;
 }
+#endif
 
 #endif // __INTEL_COMPILER