bug-1016807.diff

diff --git a/apps/settings/test/unit/panels/root/stk_item_test.js b/apps/settings/test/unit/panels/root/stk_item_test.js
index 4b31d2d..7ecd498 100644
--- a/apps/settings/test/unit/panels/root/stk_item_test.js
+++ b/apps/settings/test/unit/panels/root/stk_item_test.js
@@ -1,20 +1,10 @@
 'use strict';
-/* globals MocksHelper, MockNavigatorSettings */
 requireApp('settings/shared/test/unit/load_body_html_helper.js');
-require('/shared/test/unit/mocks_helper.js');
-
-var mocksForIccMenu = ['Settings'];
-
-mocksForIccMenu.forEach(function(mockName) {
-  if (!window[mockName]) {
-    window[mockName] = null;
-  }
-});
+requireApp('settings/test/unit/mock_navigator_settings.js');
 
 suite('STK Item >', function() {
   var modules = [
     'panels/root/stk_item',
-    'unit/mock_settings',
     'shared_mocks/mock_l10n',
     'shared_mocks/mock_stk_helper',
     'shared_mocks/mock_dump',
@@ -23,13 +13,17 @@ suite('STK Item >', function() {
 
   var map = {
     '*': {
-      'modules/settings': 'unit/mock_settings',
       'shared/l10n' : 'shared_mocks/mock_l10n',
       'shared/stk_helper': 'shared_mocks/mock_stk_helper'
     }
   };
 
-  var realL10n, realMozIccManager, subject, mocksHelper, fakeTimer;
+  var realL10n;
+  var realMozIccManager;
+  var realMozSettings;
+  var subject;
+  var fakeTimer;
+  var realMozSettings;
 
   var dummySTKMenuEntries = {
     'title': 'DummyOperator',
@@ -50,15 +44,21 @@ suite('STK Item >', function() {
 
   setup(function(done) {
     var requireCtx = testRequire([], map, function() {});
-    requireCtx(modules, function(STKItem, MockSettings, MockL10n, MockSTKHelper,
+    requireCtx(modules, function(STKItem, MockL10n, MockSTKHelper,
       MockDump, MockNavigatorMozIccManager) {
+        realMozSettings = navigator.mozSettings;
         loadBodyHTML('./_root.html');
         realL10n = navigator.mozL10n;
         navigator.mozL10n = MockL10n;
+        realMozSettings = navigator.mozSettings;
         realMozIccManager = navigator.mozIccManager;
         navigator.mozIccManager = MockNavigatorMozIccManager;
-        mocksHelper = new MocksHelper(mocksForIccMenu);
-        mocksHelper.suiteSetup();
+        navigator.mozSettings = MockNavigatorSettings;
+
+        window.Settings = {
+          mozSettings: navigator.mozSettings
+        };
+
         MockDump.mSuiteSetup();
         fakeTimer = sinon.useFakeTimers();
 
@@ -72,7 +72,7 @@ suite('STK Item >', function() {
   teardown(function() {
     navigator.mozL10n = realL10n;
     navigator.mozIccManager = realMozIccManager;
-    mocksHelper.suiteTeardown();
+    navigator.mozSettings = realMozSettings;
     MockNavigatorSettings.mTeardown();
     fakeTimer.restore();
   });
@@ -104,7 +104,6 @@ suite('STK Item >', function() {
 
   suite('Dual SIM >', function() {
     setup(function() {
-      mocksHelper.setup();
       MockNavigatorSettings.mTriggerObservers('icc.applications', {
         settingValue: JSON.stringify({
           '1': {
@@ -117,10 +116,6 @@ suite('STK Item >', function() {
           }})});
     });
 
-    teardown(function() {
-      mocksHelper.teardown();
-    });
-
     test('Two entries into the STK applications list', function() {
       assert.equal(document.getElementById('icc-entries').childElementCount, 2);
     });