diff --git a/src/main/java/com/cloudbees/plugins/credentials/impl/CertificateCredentialsImpl.java b/src/main/java/com/cloudbees/plugins/credentials/impl/CertificateCredentialsImpl.java
index 6237519e..296da3af 100644
--- a/src/main/java/com/cloudbees/plugins/credentials/impl/CertificateCredentialsImpl.java
+++ b/src/main/java/com/cloudbees/plugins/credentials/impl/CertificateCredentialsImpl.java
@@ -142,7 +142,7 @@ public CertificateCredentialsImpl(@CheckForNull CredentialsScope scope,
         try {
             keyStoreSource.toKeyStore(toCharArray(this.password));
         } catch (GeneralSecurityException | IOException e) {
-            LOGGER.log(Level.WARNING, Messages.CertificateCredentialsImpl_InvalidKeystore(), e);
+            LOGGER.log(Level.WARNING, "Failed to create CertificateCredentials", e);
             throw new Descriptor.FormException(Messages.CertificateCredentialsImpl_InvalidKeystore(), e,
                                                "keyStoreSource");
         }
diff --git a/src/test/java/com/cloudbees/plugins/credentials/impl/CertificateCredentialsImplFIPSTest.java b/src/test/java/com/cloudbees/plugins/credentials/impl/CertificateCredentialsImplFIPSTest.java
index 1a522bbd..f2a7ede9 100644
--- a/src/test/java/com/cloudbees/plugins/credentials/impl/CertificateCredentialsImplFIPSTest.java
+++ b/src/test/java/com/cloudbees/plugins/credentials/impl/CertificateCredentialsImplFIPSTest.java
@@ -24,8 +24,8 @@
 public class CertificateCredentialsImplFIPSTest {
 
     @Rule
-    public RealJenkinsRule rule = new RealJenkinsRule().javaOptions("-Djenkins.security.FIPS140.COMPLIANCE=true");
-
+    public RealJenkinsRule rule = new RealJenkinsRule().withFIPSEnabled().javaOptions("-Xmx512m");
+    
     @Rule
     public TemporaryFolder tmp = new TemporaryFolder();
 
diff --git a/src/test/resources/com/cloudbees/plugins/credentials/impl/validCerts.pem b/src/test/resources/com/cloudbees/plugins/credentials/impl/validCerts.pem
index 7c15c314..06615750 100644
--- a/src/test/resources/com/cloudbees/plugins/credentials/impl/validCerts.pem
+++ b/src/test/resources/com/cloudbees/plugins/credentials/impl/validCerts.pem
@@ -1,20 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDTzCCAjegAwIBAgIUWcaB9PB40lCu4um/CD8Ni6yNxkwwDQYJKoZIhvcNAQEL
+MIIDgzCCAmugAwIBAgIUdl3Su0vyakVGHSTiFvIh+nYzq0UwDQYJKoZIhvcNAQEL
 BQAwUDELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAlROMREwDwYDVQQHDAhUaXJ1cHB1
-cjEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMB4XDTI0MTEyODE2
-MzI1OFoXDTI1MTEyODE2MzI1OFowUDELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAlRO
-MREwDwYDVQQHDAhUaXJ1cHB1cjEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQ
-dHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo8dgK5e2+wy3
-2uRxF8hiaSFnUjfKOVDYrj+RbZ+ss9Kzxm2T3nfGcjGKHVHTvkaoduVdF95V8RtQ
-I2lbwPnb/RKY6+Rlx+74e6Aw+KvCAEFa0lt0dST7IpErEetDppkkR5N/RbVXvon8
-sbJSHRZQOazFD2fG6MJJYiHqLC9xqfKOrZ07JQ9/J/mXN05mTG3gWXIlaJxf6hv3
-+n2NfkaTioor9dHGwr03S9D4CJWbJvk2006WCh9TEKCrG+oOAU/Fm+mlWndeResv
-EWHiH13BMOsqWj/q9QlMYnmRl4MN00SSKKREQAUAAd6WbXg6+iavxGpN8eJw4O72
-wti2bS6I4wIDAQABoyEwHzAdBgNVHQ4EFgQUsACQZeota/vgn2vOY0EVIMoKM7Iw
-DQYJKoZIhvcNAQELBQADggEBAEZ7qOLFPL4QJYcD3DYohFyOR2QeQQ5sceLlCg+/
-vtET3TPqBGswHER4fkOUgehud9i/h6ff33KCgTGMpGCWkYISaAbCQgGeD8AJQIOX
-aWQ12Ux/E98a4Bk9nid0moiXKTXzMBule44JolGWroxayrJnYDCo39IraJO6XxlK
-SJnI1dA1uRuJl6XKHr1N/knH3QBE4wI3CjqHc9qjTXVprhRosmTykvIeLaNL/ZxW
-/QnKD5VRWRmHFom03COkmPSyGWNp225dLgN+rv9e2Pvn0AP8CeUJAoWSXwxGpv9Y
-AgIsGfIhwQIt3AsmmujlaLvjRQpxBh00ba77kteFR4S3WMk=
------END CERTIFICATE-----
\ No newline at end of file
+cjEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMCAXDTI0MTIxMDE1
+NTY0M1oYDzIxMjQxMTE2MTU1NjQzWjBQMQswCQYDVQQGEwJJTjELMAkGA1UECAwC
+VE4xETAPBgNVBAcMCFRpcnVwcHVyMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRz
+IFB0eSBMdGQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChhYxialRH
+FZdEY1d6A0zTCi6pMnQlk/DU2xt2qV6xrI/Jkz0xIuDjCA/vD4EyEEh7aPEY5Oox
+z6zztmrhF8nG2Nis4UBAxtTHqV2D5eLPfxtrRMccrIYh6121K0B45vqcHpBq/nFM
+NGyKq1WJBmb4JTZ4MsZXcpe7rGBhApwgUdP/ey6jwf7oG2YCBOywZ7hu0Vs6yeSb
+F84RuTuVBhVdNm2BJHMy7P2BxyDpm5RSbHQGYox68pn3kfVEdv/iC/8qwq7sbyzb
+KsgvYJrpqAunTEkgLBkG/NtsSFlTzssEAtSXErfI+6b8Zd4UK6E9CoclKWyzEqMT
+9mVchox4+XL/AgMBAAGjUzBRMB0GA1UdDgQWBBRcz3Oqr5FVbBP7nu5k5Pa5x1wa
+VzAfBgNVHSMEGDAWgBRcz3Oqr5FVbBP7nu5k5Pa5x1waVzAPBgNVHRMBAf8EBTAD
+AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB0WeoppwXfGAJwhdItbgt+M11+Px2Q6NOa
+/wDVwxw59TJ7fzQdMSgdaASsxPUV6nd5itvfaAQ7dnbMst4os/GZQKLXhLr+2J7e
+2/yqW9RmRoWTL9zvRc+AG4Tv8Z2/iUDSYpGCJ1CWtUJXGVPNjKq9uXoU5sMyyfJH
+pGZTM1UDxd58KFVg8gszTzyUJjESjLG6KlrBDARAsRHgGPY7QJSEWYdC8pjXoj1p
+7XUnjWrSmEm8xon19SCvH26yB+ByG2T0gMY4de8bECu3lbzwphA0J6mEkoNNZpQn
+zRUwOldMPOuSIedVN5nSwE4TlkmzWvLsP+2JxegtEKB+jqYg9dsq
+-----END CERTIFICATE-----