--- a/test/jdk/sun/security/tools/keytool/PSS.java	Wed May 08 16:47:53 2019 -0700
+++ b/test/jdk/sun/security/tools/keytool/PSS.java	Thu May 09 08:49:31 2019 +0800
@@ -23,14 +23,18 @@
 
 /*
  * @test
- * @bug 8215694
+ * @bug 8215694 8222987
  * @summary keytool cannot generate RSASSA-PSS certificates
  * @library /test/lib
  * @modules java.base/sun.security.util
  *          java.base/sun.security.x509
+ * @requires os.family != "solaris"
  * @run main PSS
  */
 
+// This test is excluded from Solaris because the 8192-bit RSA key pair
+// generator is extremely slow there.
+
 import jdk.test.lib.Asserts;
 import jdk.test.lib.SecurityTools;
 import jdk.test.lib.process.OutputAnalyzer;