diff --git a/src/java.desktop/unix/native/common/awt/fontpath.c b/src/java.desktop/unix/native/common/awt/fontpath.c
index 95499cfc948..d3821504bfb 100644
--- a/src/java.desktop/unix/native/common/awt/fontpath.c
+++ b/src/java.desktop/unix/native/common/awt/fontpath.c
@@ -1038,7 +1038,7 @@ Java_sun_font_FontConfigManager_getFontConfig
             return;
         }
         fontCount = 0;
-        minGlyphs = 20;
+        minGlyphs = 0;
         if (debugMinGlyphsStr != NULL) {
             int val = minGlyphs;
             sscanf(debugMinGlyphsStr, "%5d", &val);
@@ -1086,14 +1086,6 @@ Java_sun_font_FontConfigManager_getFontConfig
                 return;
             }
 
-            /* We don't want 20 or 30 fonts, so once we hit 10 fonts,
-             * then require that they really be adding value. Too many
-             * adversely affects load time for minimal value-add.
-             * This is still likely far more than we've had in the past.
-             */
-            if (j==10) {
-                minGlyphs = 50;
-            }
             if (unionCharset == NULL) {
                 unionCharset = charset;
             } else {
diff --git a/test/jdk/sun/awt/font/TestArabicHebrew.java b/test/jdk/sun/awt/font/TestArabicHebrew.java
index 61cbe931c32..356d36a4d21 100644
--- a/test/jdk/sun/awt/font/TestArabicHebrew.java
+++ b/test/jdk/sun/awt/font/TestArabicHebrew.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4198081
+ * @bug 4198081 8357252
  * @key headful
  * @summary Arabic characters should appear instead of boxes and be correctly shaped.
  *          Hebrew characters should appear instead of boxes.