diff --git a/test/ios/KIFTestActor+MapboxGL.h b/test/ios/KIFTestActor+MapboxGL.h
index df83b2377..d16e34848 100644
--- a/test/ios/KIFTestActor+MapboxGL.h
+++ b/test/ios/KIFTestActor+MapboxGL.h
@@ -1,12 +1,12 @@
 #import <UIKit/UIKit.h>
 #import <KIF/KIF.h>
 
-@class MGLMapView;
+@class MGLTViewController, MGLMapView;
 
 @interface KIFTestActor (MapboxGL)
 
 @property (nonatomic, readonly) UIWindow *window;
-@property (nonatomic, readonly) UIViewController *viewController;
+@property (nonatomic, readonly) MGLTViewController *viewController;
 @property (nonatomic, readonly) MGLMapView *mapView;
 @property (nonatomic, readonly) UIView *compass;
 
diff --git a/test/ios/KIFTestActor+MapboxGL.m b/test/ios/KIFTestActor+MapboxGL.m
index ef40c1bed..330adfdc2 100644
--- a/test/ios/KIFTestActor+MapboxGL.m
+++ b/test/ios/KIFTestActor+MapboxGL.m
@@ -10,8 +10,8 @@
     return [[UIApplication sharedApplication] statusBarWindow];
 }
 
-- (UIViewController *)viewController {
-    return (UIViewController *)[[tester.mapView nextResponder] nextResponder];
+- (MGLTViewController *)viewController {
+    return (MGLTViewController *)[[tester.mapView nextResponder] nextResponder];
 }
 
 - (MGLMapView *)mapView {
diff --git a/test/ios/MGLTViewController.h b/test/ios/MGLTViewController.h
index 39df59bb5..f8d561899 100644
--- a/test/ios/MGLTViewController.h
+++ b/test/ios/MGLTViewController.h
@@ -2,4 +2,6 @@
 
 @interface MGLTViewController : UIViewController
 
+- (void)insetMapView;
+
 @end
diff --git a/test/ios/MGLTViewController.m b/test/ios/MGLTViewController.m
index e839c4504..2cb2b939c 100644
--- a/test/ios/MGLTViewController.m
+++ b/test/ios/MGLTViewController.m
@@ -2,17 +2,25 @@
 #import "MapboxGL.h"
 
 @implementation MGLTViewController
+{
+    MGLMapView *_mapView;
+}
 
 - (void)viewDidLoad
 {
     [super viewDidLoad];
 
-    MGLMapView *mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds
+    _mapView = [[MGLMapView alloc] initWithFrame:self.view.bounds
                                                 accessToken:@"pk.eyJ1IjoianVzdGluIiwiYSI6Ik9RX3RRQzAifQ.dmOg_BAp1ywuDZMM7YsXRg"];
-    mapView.viewControllerForLayoutGuides = self;
-    mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    _mapView.viewControllerForLayoutGuides = self;
+    _mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 
-    [self.view addSubview:mapView];
+    [self.view addSubview:_mapView];
+}
+
+- (void)insetMapView
+{
+    _mapView.frame = CGRectInset(_mapView.frame, 50, 50);
 }
 
 @end
diff --git a/test/ios/MapViewTests.m b/test/ios/MapViewTests.m
index deed521b7..2d87b43c1 100644
--- a/test/ios/MapViewTests.m
+++ b/test/ios/MapViewTests.m
@@ -4,6 +4,7 @@
 #import "KIFTestActor+MapboxGL.h"
 
 #import "MapboxGL.h"
+#import "MGLTViewController.h"
 
 @interface MapViewTests : KIFTestCase <MGLMapViewDelegate>
 
@@ -297,6 +298,28 @@
                    @"rotated device should not have attribution button under toolbar");
 }
 
+- (void)testInsetMapView {
+    [tester.viewController insetMapView];
+    [tester waitForAnimationsToFinish];
+    
+    UIView *logoBug = (UIView *)[tester waitForViewWithAccessibilityLabel:@"Mapbox logo"];
+    UIView *attributionButton = (UIView *)[tester waitForViewWithAccessibilityLabel:@"Attribution info"];
+    
+    CGRect mapViewFrame = [tester.mapView.superview convertRect:tester.mapView.frame toView:nil];
+    
+    CGRect logoBugFrame = [logoBug.superview convertRect:logoBug.frame toView:nil];
+    XCTAssertTrue(CGRectIntersectsRect(logoBugFrame, mapViewFrame),
+                  @"logo bug should lie inside shrunken map view");
+    
+    CGRect attributionButtonFrame = [attributionButton.superview convertRect:attributionButton.frame toView:nil];
+    XCTAssertTrue(CGRectIntersectsRect(attributionButtonFrame, mapViewFrame),
+                  @"attribution button should lie inside shrunken map view");
+    
+    CGRect compassFrame = [tester.compass.superview convertRect:tester.compass.frame toView:nil];
+    XCTAssertTrue(CGRectIntersectsRect(compassFrame, mapViewFrame),
+                  @"compass should lie inside shrunken map view");
+}
+
 - (void)testDelegateRegionWillChange {
     __block NSUInteger unanimatedCount;
     __block NSUInteger animatedCount;