diff --git a/src/Compilers/Core/NativeClientTests/native_client_tests.cpp b/src/Compilers/Core/NativeClientTests/native_client_tests.cpp
index b7ad881cbb44cf7c12a66b17c2939e7b43a4f9c3..ff4c41b6c86a1e4f9e7796f75cde3fe550549bc8 100644
--- a/src/Compilers/Core/NativeClientTests/native_client_tests.cpp
+++ b/src/Compilers/Core/NativeClientTests/native_client_tests.cpp
@@ -1,5 +1,11 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+// Disable warning about static explicit specialization until bug 1118730 is fixed
+#pragma warning( push )
+#pragma warning( disable: 4499 )
 #include "CppUnitTest.h"
+#pragma warning (pop)
+
 #include "pipe_extensions.h"
 #include <memory>
 #include <sstream>
@@ -12,20 +18,20 @@ namespace Microsoft
         namespace CppUnitTestFramework 
         {
             template<>
-            static wstring ToString<RequestLanguage>(const RequestLanguage& lang)
+            wstring ToString<RequestLanguage>(const RequestLanguage& lang)
             {
                 return lang == RequestLanguage::CSHARPCOMPILE
                     ? L"CSHARPCOMPILE" : L"VBCOMPILE";
             }
 
             template<>
-            static wstring ToString <vector<Request::Argument>>(const vector<Request::Argument>& vec)
+            wstring ToString <vector<Request::Argument>>(const vector<Request::Argument>& vec)
             {
                 return L"";
             }
 
             template<>
-            static wstring ToString <vector<BYTE>>(const vector<BYTE>& vec)
+            wstring ToString <vector<BYTE>>(const vector<BYTE>& vec)
             {
                 return L"";
             }