=== modified file 'tests/autopilot/music_app/__init__.py'
--- tests/autopilot/music_app/__init__.py	2015-05-04 14:07:05 +0000
+++ tests/autopilot/music_app/__init__.py	2015-09-09 20:14:20 +0000
@@ -49,9 +49,7 @@
     def __init__(self, app_proxy):
         self.app = app_proxy
 
-        # Use only objectName due to bug 1350532 as it is MainView12
-        self.main_view = self.app.wait_select_single(
-            objectName="musicMainView")
+        self.main_view = self.app.wait_select_single(MainView)
         self.player = self.app.select_single(Player, objectName='player')
 
     def get_add_to_playlist_page(self):
@@ -442,6 +440,11 @@
     """Autopilot custom proxy object for the MainView."""
     retry_delay = 0.2
 
+    # bug 1341671 means AP sees this as MainView12
+    @classmethod
+    def get_type_query_name(cls):
+        return 'MainView12'
+
     def __init__(self, *args):
         super(MainView, self).__init__(*args)
         self.visible.wait_for(True)