diff --git a/gm/tests/rebaseline.sh b/gm/tests/rebaseline.sh
index be8ccf291..71af20f44 100755
--- a/gm/tests/rebaseline.sh
+++ b/gm/tests/rebaseline.sh
@@ -6,6 +6,12 @@
 #
 # YOU MUST RE-RUN THIS UNTIL THE SELF-TESTS SUCCEED!
 # (It takes one run for each failing call to gm_test in run.sh)
+#
+# TODO: currently, this must be run on Linux to generate baselines that match
+# the ones on the housekeeper bot (which runs on Linux... see
+# http://70.32.156.51:10117/builders/Skia_PerCommit_House_Keeping/builds/1417/steps/RunGmSelfTests/logs/stdio )
+# See https://code.google.com/p/skia/issues/detail?id=677
+# ('make tools/tests/run.sh work cross-platform')
 
 function replace_expected_with_actual {
   # Delete all the expected output files
diff --git a/gm/tests/run.sh b/gm/tests/run.sh
index 46c892911..c23e145f0 100755
--- a/gm/tests/run.sh
+++ b/gm/tests/run.sh
@@ -5,8 +5,11 @@
 # These tests are run by the Skia_PerCommit_House_Keeping bot at every commit,
 # so make sure that they still pass when you make changes to gm!
 #
-# TODO: Even though these tests are passing on the Skia_PerCommit_House_Keeping
-# bot (which runs on Linux), they fail when I run them on my Mac.
+# TODO: currently, this only passes on Linux (which is the platform that
+# the housekeeper bot runs on, e.g.
+# http://70.32.156.51:10117/builders/Skia_PerCommit_House_Keeping/builds/1417/steps/RunGmSelfTests/logs/stdio )
+# See https://code.google.com/p/skia/issues/detail?id=677
+# ('make tools/tests/run.sh work cross-platform')
 # Ideally, these tests should pass on all development platforms...
 # otherwise, how can developers be expected to test them before committing a
 # change?
diff --git a/tools/tests/run.sh b/tools/tests/run.sh
index 1acb12401..773180509 100755
--- a/tools/tests/run.sh
+++ b/tools/tests/run.sh
@@ -1,7 +1,17 @@
 #!/bin/bash
 
 # Tests for our tools.
+#
 # TODO: for now, it only tests skdiff
+#
+# TODO: currently, this only passes on Linux (which is the platform that
+# the housekeeper bot runs on, e.g.
+# http://70.32.156.51:10117/builders/Skia_PerCommit_House_Keeping/builds/1415/steps/RunToolSelfTests/logs/stdio )
+# See https://code.google.com/p/skia/issues/detail?id=677
+# ('make tools/tests/run.sh work cross-platform')
+# Ideally, these tests should pass on all development platforms...
+# otherwise, how can developers be expected to test them before committing a
+# change?
 
 # cd into .../trunk so all the paths will work
 cd $(dirname $0)/../..