diff --git a/indra/llmath/tests/llquaternion_test.cpp b/indra/llmath/tests/llquaternion_test.cpp
index ba102efdb5cedefe7f797d21e1eebcf0471eb815..165fbbbe99f98436daa9f283e720583eae8f6279 100644
--- a/indra/llmath/tests/llquaternion_test.cpp
+++ b/indra/llmath/tests/llquaternion_test.cpp
@@ -277,7 +277,7 @@ namespace tut
 	template<> template<>
 	void llquat_test_object_t::test<9>()
 	{
-#if LL_LINUX
+#if LL_LINUX || LL_DARWIN
         skip("This test fails depending on architecture. Need to fix comparison operation, is_approx_equal, to work on more than one platform.");
 #endif
 		
@@ -335,7 +335,7 @@ namespace tut
 	template<> template<>
 	void llquat_test_object_t::test<10>()
 	{
-#if LL_LINUX
+#if LL_LINUX || LL_DARWIN
         skip("This test fails depending on architecture. Need to fix comparison operation, is_approx_equal, to work on more than one platform.");
 #endif
 		LLVector4 vect(12.0f, 5.0f, 60.0f, 75.1f);
diff --git a/indra/llmath/tests/m3math_test.cpp b/indra/llmath/tests/m3math_test.cpp
index 2a0fe76aa7b85257daba5d7e0a317736813be2ff..839cf90cf6c39a87dc030c31580aeb64870966a7 100644
--- a/indra/llmath/tests/m3math_test.cpp
+++ b/indra/llmath/tests/m3math_test.cpp
@@ -227,6 +227,10 @@ namespace tut
 	template<> template<>
 	void m3math_test_object_t::test<9>()
 	{
+#if LL_DARWIN
+        skip("This test fails depending on architecture. Need to fix comparison operation, is_approx_equal, to work on more than one platform.");
+#endif
+        
 		LLMatrix3 llmat_obj1;
 		LLQuaternion llmat_quat;		
 		
@@ -281,14 +285,16 @@ namespace tut
 	template<> template<>
 	void m3math_test_object_t::test<12>()
 	{
+#if LL_LINUX || LL_DARWIN
+        skip("This test fails depending on architecture. Need to fix comparison operation, is_approx_equal, to work on more than one platform.");
+#endif
+        
 		LLMatrix3 llmat_obj;
 
 		LLVector3 llvec1(1, 4, 3);
 		LLVector3 llvec2(1, 2, 0);
 		LLVector3 llvec3(2, 4, 2);
 
-        skip("This test fails depending on architecture. Need to fix comparison operation, is_approx_equal, to work on more than one platform.");
-
 		llmat_obj.setRows(llvec1, llvec2, llvec3);
 		llmat_obj.orthogonalize();
 
diff --git a/indra/test/llsdmessagebuilder_tut.cpp b/indra/test/llsdmessagebuilder_tut.cpp
index 357fd3d9e5dd57a9f6355a7a81545a36473306be..698fb0ffe8e5e61320007db55a2baca6a23d5e06 100644
--- a/indra/test/llsdmessagebuilder_tut.cpp
+++ b/indra/test/llsdmessagebuilder_tut.cpp
@@ -649,8 +649,8 @@ namespace tut
 	template<> template<>
 	void LLSDMessageBuilderTestObject::test<37>()
 	{
-#if LL_GNUC && (GCC_VERSION > 70000 && GCC_VERSION < 90000)
-	  skip("This test is prone to failures on GCC 8.x");
+#if LL_LINUX || LL_DARWIN
+        skip("This test fails depending on architecture. Need to fix comparison operation, is_approx_equal, to work on more than one platform.");
 #endif
 	  LLQuaternion data(0.3713907f, 0.5570861f, 0.7427813f,0.0f);
 
diff --git a/indra/test/lltemplatemessagebuilder_tut.cpp b/indra/test/lltemplatemessagebuilder_tut.cpp
index 10564ad7b3974a9eb952641384771ed254426ec2..f2a93efd3c5ab10911f6bd69ed50b2a297eda16c 100644
--- a/indra/test/lltemplatemessagebuilder_tut.cpp
+++ b/indra/test/lltemplatemessagebuilder_tut.cpp
@@ -317,6 +317,9 @@ namespace tut
 	void LLTemplateMessageBuilderTestObject::test<14>()
 		 // Quaternion
 	{
+#if LL_DARWIN
+        skip("This test fails depending on architecture. Need to fix comparison operation, is_approx_equal, to work on more than one platform.");
+#endif
 		LLMessageTemplate messageTemplate = defaultTemplate();
 		messageTemplate.addBlock(defaultBlock(MVT_LLQuaternion, 12));
         LLQuaternion outValue, inValue = LLQuaternion(0.0f, LLVector3(0.3713907f, 0.5570861f, 0.7427813f));
@@ -785,6 +788,9 @@ namespace tut
 	void LLTemplateMessageBuilderTestObject::test<38>()
 		 // non-zero offset with Quaternion
 	{
+#if LL_DARWIN
+        skip("This test fails depending on architecture. Need to fix comparison operation, is_approx_equal, to work on more than one platform.");
+#endif
 		LLMessageTemplate messageTemplate = defaultTemplate();
 		messageTemplate.addBlock(defaultBlock(MVT_LLQuaternion, 12));
 		LLQuaternion outValue, inValue = LLQuaternion(0.0f, LLVector3(0.3713907f, 0.5570861f, 0.7427813f));