--- a/test/jdk/sun/security/tools/keytool/fakegen/DefaultSignatureAlgorithm.java	Tue Jul 23 11:30:31 2019 -0700
+++ b/test/jdk/sun/security/tools/keytool/fakegen/DefaultSignatureAlgorithm.java	Wed Jul 24 10:09:22 2019 +0800
@@ -23,16 +23,21 @@
 
 /*
  * @test
- * @bug 8138766 8227059
+ * @bug 8138766 8227059 8227595
  * @summary New default -sigalg for keytool
  * @library /test/lib
  * @build java.base/sun.security.rsa.RSAKeyPairGenerator
  *        java.base/sun.security.provider.DSAKeyPairGenerator
  *        jdk.crypto.ec/sun.security.ec.ECKeyPairGenerator
+ * @requires os.family != "solaris"
  * @run main DefaultSignatureAlgorithm
  * @modules jdk.crypto.ec
  */
 
+// This test is excluded from Solaris because the RSA key pair generator
+// is extremely slow there with a big keysize. Please note the fake
+// KeyPairGenerator will not be used because of provider preferences.
+
 import jdk.test.lib.Asserts;
 import jdk.test.lib.SecurityTools;
 import jdk.test.lib.process.OutputAnalyzer;

--- a/test/jdk/sun/security/tools/keytool/fakegen/PSS.java	Tue Jul 23 11:30:31 2019 -0700
+++ b/test/jdk/sun/security/tools/keytool/fakegen/PSS.java	Wed Jul 24 10:09:22 2019 +0800
@@ -34,7 +34,8 @@
  */
 
 // This test is excluded from Solaris because the 8192-bit RSA key pair
-// generator is extremely slow there.
+// generator is extremely slow there. Please note the fake
+// KeyPairGenerator will not be used because of provider preferences.
 
 import jdk.test.lib.Asserts;
 import jdk.test.lib.SecurityTools;