diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index 03ef11d8e56b3dbbaf32d62aa72b99783bf0a88b..b4d0bb6823f1492921169718393379043b230669 100755
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -58,7 +58,6 @@
 #include "llmachineid.h"
 #include "llupdaterservice.h"
 #include "llevents.h"
-#include "llnotificationsutil.h"
 #include "llappviewer.h"
 
 #include <boost/scoped_ptr.hpp>
@@ -75,9 +74,14 @@ namespace {
 	{
 	public:
 		MandatoryUpdateMachine(LLLoginInstance & loginInstance, LLUpdaterService & updaterService);
-		
+
 		void start(void);
-		
+
+		LLNotificationsInterface& getNotificationsInterface() const
+		{
+			return mLoginInstance.getNotificationsInterface();
+		}
+
 	private:
 		class State;
 		class CheckingForUpdate;
@@ -87,6 +91,7 @@ namespace {
 		class WaitingForDownload;
 
 		boost::scoped_ptr<State> mState;
+		LLLoginInstance &  mLoginInstance;
 		LLUpdaterService & mUpdaterService;
 		
 		void setCurrentState(State * newState);
@@ -192,6 +197,7 @@ std::string construct_start_string();
 
 
 MandatoryUpdateMachine::MandatoryUpdateMachine(LLLoginInstance & loginInstance, LLUpdaterService & updaterService):
+	mLoginInstance(loginInstance),
 	mUpdaterService(updaterService)
 {
 	; // No op.
@@ -326,7 +332,7 @@ MandatoryUpdateMachine::Error::Error(MandatoryUpdateMachine & machine):
 void MandatoryUpdateMachine::Error::enter(void)
 {
 	LL_INFOS() << "entering error" << LL_ENDL;
-	LLNotificationsUtil::add("FailedRequiredUpdateInstall", LLSD(), LLSD(), boost::bind(&MandatoryUpdateMachine::Error::onButtonClicked, this, _1, _2));
+	mMachine.getNotificationsInterface().add("FailedRequiredUpdateInstall", LLSD(), LLSD(), boost::bind(&MandatoryUpdateMachine::Error::onButtonClicked, this, _1, _2));
 }
 
 
@@ -382,7 +388,7 @@ MandatoryUpdateMachine::StartingUpdaterService::StartingUpdaterService(Mandatory
 void MandatoryUpdateMachine::StartingUpdaterService::enter(void)
 {
 	LL_INFOS() << "entering start update service" << LL_ENDL;
-	LLNotificationsUtil::add("UpdaterServiceNotRunning", LLSD(), LLSD(), boost::bind(&MandatoryUpdateMachine::StartingUpdaterService::onButtonClicked, this, _1, _2));
+	mMachine.getNotificationsInterface().add("UpdaterServiceNotRunning", LLSD(), LLSD(), boost::bind(&MandatoryUpdateMachine::StartingUpdaterService::onButtonClicked, this, _1, _2));
 }
 
 
diff --git a/indra/newview/lllogininstance.h b/indra/newview/lllogininstance.h
index b0247da7c8313a0a5859090072dd3ea5c4e6c3c8..c6773bbf6807ad635273ea4cf8620b7a14384d0b 100755
--- a/indra/newview/lllogininstance.h
+++ b/indra/newview/lllogininstance.h
@@ -70,6 +70,7 @@ class LLLoginInstance : public LLSingleton<LLLoginInstance>
 	void setPlatformInfo(const std::string platform, const std::string platform_version);
 
 	void setNotificationsInterface(LLNotificationsInterface* ni) { mNotifications = ni; }
+	LLNotificationsInterface& getNotificationsInterface() const { return *mNotifications; }
 
 	typedef boost::function<void()> UpdaterLauncherCallback;
 	void setUpdaterLauncher(const UpdaterLauncherCallback& ulc) { mUpdaterLauncher = ulc; }
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index 9ee64037398bf50264d69487a7d25445723ae13d..1b0334498e25f264b79c65f42133196f21dbb8a0 100755
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -192,14 +192,6 @@ const std::string &LLVersionInfo::getChannel() { return VIEWERLOGIN_CHANNEL; }
 void LLAppViewer::forceQuit(void) {}
 LLAppViewer * LLAppViewer::sInstance = 0;
 
-//-----------------------------------------------------------------------------
-#include "llnotificationsutil.h"
-LLNotificationPtr LLNotificationsUtil::add(const std::string& name, 
-					  const LLSD& substitutions, 
-					  const LLSD& payload, 
-					  boost::function<void (const LLSD&, const LLSD&)> functor) { return LLNotificationPtr((LLNotification*)0); }
-
-
 //-----------------------------------------------------------------------------
 #include "llupdaterservice.h"
 
@@ -488,8 +480,6 @@ namespace tut
     template<> template<>
     void lllogininstance_object::test<3>()
     {
-		skip("test fails with Xcode 6, skipping");
-		
 		set_test_name("Test Mandatory Update User Accepts");
 
 		// Part 1 - Mandatory Update, with User accepts response.
@@ -517,8 +507,6 @@ namespace tut
 	template<> template<>
     void lllogininstance_object::test<4>()
     {
-		skip("test fails with Xcode 6, skipping");
-		
 		set_test_name("Test Mandatory Update User Decline");
 
 		// Test connect with update needed.