diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index e46014f1a9..58c528474f 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -289,7 +289,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
     protected ClassLoader createClassLoader(List<File> paths, ClassLoader parent, Attributes atts) throws IOException {
         if (atts != null) {
             String usePluginFirstClassLoader = atts.getValue( "PluginFirstClassLoader" );
-            if (Boolean.valueOf( usePluginFirstClassLoader )) {
+            if (Boolean.parseBoolean( usePluginFirstClassLoader )) {
                 PluginFirstClassLoader classLoader = new PluginFirstClassLoader();
                 classLoader.setParentFirst( false );
                 classLoader.setParent( parent );
diff --git a/core/src/main/java/hudson/model/BooleanParameterDefinition.java b/core/src/main/java/hudson/model/BooleanParameterDefinition.java
index 15cb4ec80a..5a96b06ec2 100644
--- a/core/src/main/java/hudson/model/BooleanParameterDefinition.java
+++ b/core/src/main/java/hudson/model/BooleanParameterDefinition.java
@@ -65,7 +65,7 @@ public class BooleanParameterDefinition extends SimpleParameterDefinition {
     }
 
     public ParameterValue createValue(String value) {
-        return new BooleanParameterValue(getName(),Boolean.valueOf(value),getDescription());
+        return new BooleanParameterValue(getName(),Boolean.parseBoolean(value),getDescription());
     }
 
     @Override
diff --git a/core/src/main/java/jenkins/model/Configuration.java b/core/src/main/java/jenkins/model/Configuration.java
index 8b4cea7ac7..66ca7302c3 100644
--- a/core/src/main/java/jenkins/model/Configuration.java
+++ b/core/src/main/java/jenkins/model/Configuration.java
@@ -31,7 +31,7 @@ public class Configuration {
 
     public static boolean getBooleanConfigParameter(String name, boolean defaultValue) {
         String value = getStringConfigParameter(name,null);
-        return (value==null)?defaultValue:Boolean.valueOf(value);
+        return (value==null)?defaultValue:Boolean.parseBoolean(value);
     }
 
     public static String getStringConfigParameter(String name, String defaultValue) {
diff --git a/core/src/main/java/jenkins/security/FrameOptionsPageDecorator.java b/core/src/main/java/jenkins/security/FrameOptionsPageDecorator.java
index eaade662f4..0fb11fa4ed 100644
--- a/core/src/main/java/jenkins/security/FrameOptionsPageDecorator.java
+++ b/core/src/main/java/jenkins/security/FrameOptionsPageDecorator.java
@@ -15,5 +15,5 @@ import org.kohsuke.accmod.restrictions.NoExternalUse;
 @Extension(ordinal = 1000) @Symbol("frameOptions")
 public class FrameOptionsPageDecorator extends PageDecorator {
     @Restricted(NoExternalUse.class)
-    public static boolean enabled = Boolean.valueOf(SystemProperties.getString(FrameOptionsPageDecorator.class.getName() + ".enabled", "true"));
+    public static boolean enabled = Boolean.parseBoolean(SystemProperties.getString(FrameOptionsPageDecorator.class.getName() + ".enabled", "true"));
 }