diff --git a/Examples.xcodeproj/xcshareddata/xcschemes/Examples.xcscheme b/Examples.xcodeproj/xcshareddata/xcschemes/Examples.xcscheme
index 2278147c..4bb2e7a9 100644
--- a/Examples.xcodeproj/xcshareddata/xcschemes/Examples.xcscheme
+++ b/Examples.xcodeproj/xcshareddata/xcschemes/Examples.xcscheme
@@ -54,13 +54,13 @@
             </BuildableReference>
             <SkippedTests>
                <Test
-                  Identifier = "ExamplesUITests/testAnimatedLineExample">
+                  Identifier = "ExamplesUITests/testAnimatedLineExampleObjC">
                </Test>
                <Test
-                  Identifier = "ExamplesUITests/testBuildingLightExample">
+                  Identifier = "ExamplesUITests/testBuildingLightExampleObjC">
                </Test>
                <Test
-                  Identifier = "ExamplesUITests/testCustomAnnotationView">
+                  Identifier = "ExamplesUITests/testCustomAnnotationViewObjC">
                </Test>
             </SkippedTests>
          </TestableReference>
diff --git a/ExamplesUITests/ExamplesUITests.m b/ExamplesUITests/ExamplesUITests.m
index d80410df..baf77ce1 100644
--- a/ExamplesUITests/ExamplesUITests.m
+++ b/ExamplesUITests/ExamplesUITests.m
@@ -38,9 +38,10 @@ - (void)tearDown {
  testAnimatedLineExample
  Wait for the line to be fully animated
  */
-- (void)testAnimatedLineExample {
-
+- (void)testAnimatedLineExampleObjC {
+    
     [XCTContext runActivityNamed:@"AnimatedLineExample" block:^(id<XCTActivity>  _Nonnull activity) {
+        [self.app.navigationBars[@"Examples"].buttons[@"ObjC"] tap];
         [self.app.tables.staticTexts[@"Animate a line"] tap];
 
         // Wait for notification
@@ -55,12 +56,13 @@ - (void)testAnimatedLineExample {
  testCustomAnnotationView
  Zoom and rotate the map.
  */
-- (void)testCustomAnnotationView {
+- (void)testCustomAnnotationViewObjC {
 
     __block XCUIElement *element;
     __block XCUIElement *compass;
 
     [XCTContext runActivityNamed:@"Wait for initial render" block:^(id<XCTActivity>  _Nonnull activity) {
+        [self.app.navigationBars[@"Examples"].buttons[@"ObjC"] tap];
         [self.app.tables.staticTexts[@"Annotation views"] tap];
         XCUIElementQuery *allQuery = [self.app descendantsMatchingType:XCUIElementTypeAny];
         element = [allQuery elementMatchingType:XCUIElementTypeAny identifier:@"MGLMapViewId"];
@@ -91,11 +93,12 @@ - (void)testCustomAnnotationView {
     }];
 }
 
-- (void)testBuildingLightExample {
+- (void)testBuildingLightExampleObjC {
     __block XCUIElement *element;
     __block XCUIElement *slider;
 
     [XCTContext runActivityNamed:@"Wait for initial render" block:^(id<XCTActivity>  _Nonnull activity) {
+        [self.app.navigationBars[@"Examples"].buttons[@"ObjC"] tap];
         [self.app.tables.staticTexts[@"Adjust lighting of 3D buildings"] tap];
         XCUIElementQuery *allQuery = [self.app descendantsMatchingType:XCUIElementTypeAny];
         element = [allQuery elementMatchingType:XCUIElementTypeAny identifier:@"MGLMapViewId"];