diff --git a/mbgl.gypi b/mbgl.gypi
index 47299a0ae..e1f94977b 100644
--- a/mbgl.gypi
+++ b/mbgl.gypi
@@ -22,6 +22,8 @@
           'GCC_WARN_PEDANTIC': 'YES',
           'GCC_WARN_UNINITIALIZED_AUTOS': 'YES_AGGRESSIVE',
           'MACOSX_DEPLOYMENT_TARGET': '10.10',
+          'ALWAYS_SEARCH_USER_PATHS': 'NO',
+          'COMBINE_HIDPI_IMAGES': 'YES',
         },
       }, {
         'cflags_cc': [
@@ -120,6 +122,14 @@
       },
     },
   },
+  'configurations': {
+    'Debug': {
+      'xcode_settings': {
+        'ENABLE_TESTABILITY': 'YES',
+        'ONLY_ACTIVE_ARCH': 'YES',
+      },
+    },
+  },
   'targets': [
     {
       'target_name': 'core',
diff --git a/platform/ios/platform.gyp b/platform/ios/platform.gyp
index 2b1275396..9b7753b93 100644
--- a/platform/ios/platform.gyp
+++ b/platform/ios/platform.gyp
@@ -54,6 +54,7 @@
         'CLANG_ENABLE_OBJC_ARC': 'YES',
         'CLANG_ENABLE_MODULES': 'YES',
         'CODE_SIGN_IDENTITY': 'iPhone Developer',
+        'PRODUCT_BUNDLE_IDENTIFIER': 'com.mapbox.MapboxGLUnitTest',
       },
 
       'copies': [{
diff --git a/test/src/app-info.plist b/test/src/app-info.plist
index 7a5b9f51d..bd3ef2c40 100644
--- a/test/src/app-info.plist
+++ b/test/src/app-info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.mapbox.MapboxGLUnitTest</string>
+	<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>