diff --git a/Makefile b/Makefile
index fb1c5b3ec..efc2385ce 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ build/test/Makefile: src common config.gypi test/test.gyp
 test: build/test/Makefile
 	$(MAKE) -C build/test BUILDTYPE=Testing V=$(V) test
 
-test/%: build/test/Makefile
+test_%: build/test/Makefile
 	$(MAKE) -C build/test BUILDTYPE=Testing V=$(V) $*
 	(cd build/Testing && exec ./test_$*)
 
diff --git a/mapboxgl.gyp b/mapboxgl.gyp
index fa544b18f..aa8249a94 100644
--- a/mapboxgl.gyp
+++ b/mapboxgl.gyp
@@ -34,52 +34,45 @@
       }
     },
     {
-      'target_name': 'bundle_styles',
+      'target_name': 'touch_styles',
       'type': 'none',
       'hard_dependency': 1,
       'actions': [
         {
           'action_name': 'Touch Stylesheet Directory',
           'inputs': ['styles'],
-          'outputs': [],
-          'action': ['touch', 'styles'], # required for xcode http://openradar.appspot.com/7232149
+          'outputs': ['<(PRODUCT_DIR)/'], # need to specify a distinct directory
+          'action': ['touch', 'styles'],
         }
       ],
+    },
+    {
+      'target_name': 'bundle_styles',
+      'type': 'none',
+      'hard_dependency': 1,
+      'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149
       'direct_dependent_settings': {
-        'mac_bundle_resources': [
-          'styles',
-        ],
+        'mac_bundle_resources': [ 'styles' ],
       }
     },
     {
       'target_name': 'copy_styles',
       'type': 'none',
       'hard_dependency': 1,
-      'actions': [
-        {
-          'action_name': 'Touch Stylesheet Directory',
-          'inputs': ['styles'],
-          'outputs': ['styles'],
-          'action': ['touch', 'styles'], # required for xcode http://openradar.appspot.com/7232149
-        }
-      ],
-      'copies': [
-        {
-          'files': [ 'styles' ],
-          'destination': '<(PRODUCT_DIR)'
-        }
-      ]
+      'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149
+      'copies': [{
+        'files': [ 'styles' ],
+        'destination': '<(PRODUCT_DIR)'
+      }],
     },
     {
       'target_name': 'copy_certificate_bundle',
       'type': 'none',
       'hard_dependency': 1,
-      'copies': [
-        {
-          'files': [ 'common/ca-bundle.crt' ],
-          'destination': '<(PRODUCT_DIR)'
-        }
-      ]
+      'copies': [{
+        'files': [ 'common/ca-bundle.crt' ],
+        'destination': '<(PRODUCT_DIR)'
+      }],
     },
     {
       'target_name': 'mapboxgl',
diff --git a/test/test.gyp b/test/test.gyp
index f73c94bf0..b32f0f515 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -189,7 +189,6 @@
         "dependencies": [
             "../deps/gtest/gtest.gyp:gtest",
             "../mapboxgl.gyp:mapboxgl",
-            '../mapboxgl.gyp:bundle_styles',
             "link_gl",
         ]
     },