1 files changed, 3 insertions, 14 deletions
diff --git a/src/components/application_manager/test/commands/mobile/on_keyboard_input_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_keyboard_input_notification_test.cc
index d56cd98904..7313f32dca 100644
--- a/src/components/application_manager/test/commands/mobile/on_keyboard_input_notification_test.cc
+++ b/src/components/application_manager/test/commands/mobile/on_keyboard_input_notification_test.cc
@@ -61,11 +61,9 @@ using testing::_;
 class OnKeyBoardInputNotificationTest
     : public CommandsTest<CommandsTestMocks::kIsNice> {
  public:
-  OnKeyBoardInputNotificationTest()
-      : message_helper_(*MockMessageHelper::message_helper_mock()) {}
-
   void SetSendNotificationExpectations(MessageSharedPtr msg) {
-    EXPECT_CALL(message_helper_, PrintSmartObject(_)).WillOnce(Return(false));
+    EXPECT_CALL(mock_message_helper_, PrintSmartObject(_))
+        .WillOnce(Return(false));
     EXPECT_CALL(app_mngr_, SendMessageToMobile(msg, _));
   }
 
@@ -78,14 +76,6 @@ class OnKeyBoardInputNotificationTest
               (*msg)[strings::params][strings::protocol_version].asInt());
   }
 
-  void SetUp() OVERRIDE {
-    Mock::VerifyAndClearExpectations(&message_helper_);
-  }
-
-  void TearDown() OVERRIDE {
-    Mock::VerifyAndClearExpectations(&message_helper_);
-  }
-
   MockAppPtr InitAppSetDataAccessor(SharedPtr<ApplicationSet>& app_set) {
     app_set = (!app_set ? ::utils::MakeShared<ApplicationSet>() : app_set);
     MockAppPtr app(CreateMockApp());
@@ -95,7 +85,6 @@ class OnKeyBoardInputNotificationTest
     return app;
   }
 
-  MockMessageHelper& message_helper_;
   SharedPtr<ApplicationSet> app_set_;
   sync_primitives::Lock lock_;
 };
@@ -162,7 +151,7 @@ TEST_F(OnKeyBoardInputNotificationTest, Run_InvalidApp_NoNotification) {
   EXPECT_CALL(*mock_app, hmi_level())
       .WillOnce(Return(mobile_apis::HMILevel::eType::HMI_BACKGROUND));
 
-  EXPECT_CALL(message_helper_, PrintSmartObject(_)).Times(0);
+  EXPECT_CALL(mock_message_helper_, PrintSmartObject(_)).Times(0);
   EXPECT_CALL(app_mngr_, SendMessageToMobile(msg, _)).Times(0);
 
   command->Run();