diff --git a/.gitignore b/.gitignore
index 45f8fdaa46fc8da657cf422585d808d9b9e979f1..8dc459ea276b108504c8909ffda23319fe5acaa9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,7 @@ report.xml
 
 # port server log
 portlog.txt
+
+# gyp generated make files
+*-gyp.mk
+out
\ No newline at end of file
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index a1d0376a4fa5a1cb6d3da285600bf724a7a8d148..e971aaf9c3723008ec80a48aacd1adf111371300 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -199,7 +199,9 @@ class GYPCLanguage(object):
     return [['gyp', '--depth=.', '--suffix=-gyp', 'grpc.gyp']]
 
   def make_targets(self):
-    return gyp_test_paths(False)
+    # HACK(ctiller): force fling_client and fling_server to be built, as fling_test
+    # needs these
+    return gyp_test_paths(False) + ['fling_client', 'fling_server']
 
   def build_steps(self):
     return []