--- a/jdk/test/tools/launcher/MiscTests.java	Thu Jun 25 11:59:40 2015 -0700
+++ b/jdk/test/tools/launcher/MiscTests.java	Fri Jun 26 21:34:34 2015 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,13 +37,9 @@
 
     // 6856415: Checks to ensure that proper exceptions are thrown by java
     static void test6856415() {
-        // No pkcs library on win-x64, so we bail out.
-        if (is64Bit && isWindows) {
-            return;
-        }
         StringBuilder sb = new StringBuilder();
         sb.append("public static void main(String... args) {\n");
-        sb.append("java.security.Provider p = new sun.security.pkcs11.SunPKCS11(args[0]);\n");
+        sb.append("java.security.Provider p = new sun.security.pkcs11.SunPKCS11();\n");
         sb.append("java.security.Security.insertProviderAt(p, 1);\n");
         sb.append("}");
         File testJar = new File("Foo.jar");