diff --git a/indra/llmath/tests/mathmisc_test.cpp b/indra/llmath/tests/mathmisc_test.cpp
index f12140cf8f7044579afd21a45ce104c8c7dc38bc..50e4c7074853970dd1e0c6cde141054a37fa69c6 100755
--- a/indra/llmath/tests/mathmisc_test.cpp
+++ b/indra/llmath/tests/mathmisc_test.cpp
@@ -325,6 +325,10 @@ namespace tut
 		}
 	}
 
+#if LL_WINDOWS
+#pragma warning(push)
+#pragma warning(disable : 4702)
+#endif // LL_WINDOWS
 	template<> template<>
 	void sphere_object::test<2>()
 	{
@@ -436,6 +440,9 @@ namespace tut
 			}
 		}
 	}
+#if LL_WINDOWS
+#pragma warning(pop)
+#endif // LL_WINDOWS
 }
 
 namespace tut
diff --git a/indra/llmessage/tests/llhost_test.cpp b/indra/llmessage/tests/llhost_test.cpp
index efca1bbfca6e9b1ba51b26b5ce5ef3fe1ac2c34b..ce244d003044ddbe79c284e8cd2f5746ec04aabb 100755
--- a/indra/llmessage/tests/llhost_test.cpp
+++ b/indra/llmessage/tests/llhost_test.cpp
@@ -147,6 +147,10 @@ namespace tut
 	}
 
 
+#if LL_WINDOWS
+#pragma warning(push)
+#pragma warning(disable : 4702)
+#endif // LL_WINDOWS
 //	getHostName()  and setHostByName
 	template<> template<>
 	void host_object::test<9>()
@@ -192,6 +196,9 @@ namespace tut
 			throw;
 		}
 	}
+#if LL_WINDOWS
+#pragma warning(pop)
+#endif // LL_WINDOWS
 
 //	setHostByName for dotted IP
 	template<> template<>