--- a/jdk/test/sun/security/pkcs11/PKCS11Test.java	Mon Oct 17 17:07:55 2016 -0700
+++ b/jdk/test/sun/security/pkcs11/PKCS11Test.java	Tue Oct 18 09:18:56 2016 -0400
@@ -47,6 +47,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 import java.util.Set;
 
@@ -112,7 +113,7 @@
                     found = true;
                     break;
                 }
-            } catch (Exception e) {
+            } catch (Exception | ServiceConfigurationError e) {
                 // ignore and move on to the next one
             }
         }