diff --git a/test/ProblemList.txt b/test/ProblemList.txt
index 840a9274293d25bcc290d0d4ba5297583c7f83b2..3c4dc859980a0dbf8f973ad64a67551fff08fad0 100644
--- a/test/ProblemList.txt
+++ b/test/ProblemList.txt
@@ -330,6 +330,23 @@ tools/launcher/I18NJarTest.java                                 macosx-all
 # 8007410
 tools/launcher/FXLauncherTest.java                              linux-all
 
+# 8004172
+sun/tools/jstat/jstatGcCapacityOutput1.sh                       generic-all
+sun/tools/jstat/jstatGcCauseOutput1.sh                          generic-all
+sun/tools/jstat/jstatGcOldOutput1.sh                            generic-all
+sun/tools/jstat/jstatGcOutput1.sh                               generic-all
+sun/tools/jstat/jstatGcPermCapacityOutput1.sh                   generic-all
+sun/tools/jstat/jstatLineCounts1.sh                             generic-all
+sun/tools/jstat/jstatLineCounts2.sh                             generic-all
+sun/tools/jstat/jstatLineCounts3.sh                             generic-all
+sun/tools/jstat/jstatLineCounts4.sh                             generic-all
+sun/tools/jstat/jstatOptions1.sh                                generic-all
+sun/tools/jstat/jstatTimeStamp1.sh                              generic-all
+sun/tools/jstatd/jstatdExternalRegistry.sh                      generic-all
+sun/tools/jstatd/jstatdDefaults.sh                              generic-all
+sun/tools/jstatd/jstatdPort.sh                                  generic-all
+sun/tools/jstatd/jstatdServerName.sh                            generic-all
+
 ############################################################################
 
 # jdk_jdi