diff --git a/XCODE_6_UPGRADES_TODO.txt b/XCODE_6_UPGRADES_TODO.txt
index 8f1159081027372f1662631d9187a21285d0f43b..1330e339103b882b939ca6c2e4529a0dd75ddd3d 100644
--- a/XCODE_6_UPGRADES_TODO.txt
+++ b/XCODE_6_UPGRADES_TODO.txt
@@ -12,6 +12,3 @@
 Weird folder name "build-darwin-i386/newview/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Second Life.app" - likely causes because those $() should be ${} for CMake? - No, it's something else - lots of occurences in build-darwin folder but where do they come from? ....
 
 libjpeg is placed in lib folder vs lib/release - change it to match others
-
-* test 7 fails in indra/llcommon/tests/llerror_test.cpp - added skip
-  may be a test infrastructure failure 
diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp
index 1ac72d13bfa6a51408a3652322fbf1c3b6d6f2a0..fee9492618d9971a69502fc00113e606fbe8e5bd 100755
--- a/indra/llcommon/tests/llerror_test.cpp
+++ b/indra/llcommon/tests/llerror_test.cpp
@@ -453,11 +453,6 @@ namespace
 		return "bar";
 	}
 
-	void uberLogger()
-	{
-		LL_INFOS() << "uber(" << outerLogger() << "," << innerLogger() << ")" << LL_ENDL;
-	}
-
 	class LogWhileLogging
 	{
 	public:
@@ -485,25 +480,15 @@ namespace tut
 		// handle nested logging
 	void ErrorTestObject::test<7>()
 	{
-#if LL_DARWIN
-		skip("Skip known failure on clang and intelc due to operator << differences");
-#endif
 		outerLogger();
 		ensure_message_contains(0, "inside");
 		ensure_message_contains(1, "outside(moo)");
 		ensure_message_count(2);
 
-		uberLogger();
-		ensure_message_contains(2, "inside");
-		ensure_message_contains(3, "inside");
-		ensure_message_contains(4, "outside(moo)");
-		ensure_message_contains(5, "uber(bar,moo)");
-		ensure_message_count(6);
-
 		metaLogger();
-		ensure_message_contains(6, "logging");
-		ensure_message_contains(7, "meta(baz)");
-		ensure_message_count(8);
+		ensure_message_contains(2, "logging");
+		ensure_message_contains(3, "meta(baz)");
+		ensure_message_count(4);
 	}
 
 	template<> template<>