diff --git a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
index d18e8168d7ca7d99712415ecca825929e5a2c6de..4da0c2998510ac9ffc96c09953a2ad45daf4ff0c 100755
--- a/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
+++ b/core/src/main/java/hudson/model/ChoiceParameterDefinition.java
@@ -1,5 +1,7 @@
 package hudson.model;
 
+import hudson.util.FormValidation;
+import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.export.Exported;
@@ -96,6 +98,17 @@ public class ChoiceParameterDefinition extends SimpleParameterDefinition {
         public String getHelpFile() {
             return "/help/parameter/choice.html";
         }
+
+        /**
+         * Checks if parameterised build choices are valid.
+         */
+        public FormValidation doCheckChoices(@QueryParameter String value) {
+            if (ChoiceParameterDefinition.areValidChoices(value)) {
+                return FormValidation.ok();
+            } else {
+                return FormValidation.error(Messages.ChoiceParameterDefinition_MissingChoices());
+            }
+        }
     }
 
 }
\ No newline at end of file
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index b64a2cf733d2264271456d987b3bb64015322947..55264eedc0f6084767eeff2ebd0888f147c92625 100755
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -3560,17 +3560,6 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
             return FormValidation.error(Messages.Hudson_ViewAlreadyExists(view));
     }
 
-    /**
-     * Checks if parameterised build choices are valid.
-     */
-    public FormValidation doCheckChoices(@QueryParameter String value) {
-        if (ChoiceParameterDefinition.areValidChoices(value)) {
-            return FormValidation.ok();
-        } else {
-            return FormValidation.error(Messages.ChoiceParameterDefinition_MissingChoices());
-        }
-    }
-
     /**
      * Serves static resources placed along with Jelly view files.
      * <p>
diff --git a/core/src/main/resources/hudson/model/ChoiceParameterDefinition/config.jelly b/core/src/main/resources/hudson/model/ChoiceParameterDefinition/config.jelly
index 523c3044e6cbe6e8dff5abbc772e2eb432955d04..fb0aea9b55e1b976ab524e9ca91252af2c133aa4 100755
--- a/core/src/main/resources/hudson/model/ChoiceParameterDefinition/config.jelly
+++ b/core/src/main/resources/hudson/model/ChoiceParameterDefinition/config.jelly
@@ -30,7 +30,7 @@ THE SOFTWARE.
 		<f:textbox name="parameter.name" value="${instance.name}" />
 	</f:entry>
 	<f:entry title="${%Choices}" help="/help/parameter/choice-choices.html">
-		<f:textarea checkUrl="'${rootURL}/checkChoices?value='+encodeURIComponent(this.value)" name="parameter.choices" value="${instance.choicesText}" />
+		<f:textarea checkUrl="'${rootURL}/descriptorByName/hudson.model.ChoiceParameterDefinition/checkChoices?value='+encodeURIComponent(this.value)" name="parameter.choices" value="${instance.choicesText}" />
 	</f:entry>
     <f:entry title="${%Description}" help="/help/parameter/description.html">
         <f:textarea name="parameter.description" value="${instance.description}" />
diff --git a/core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java b/core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java
index 95590ce97a14d68b4f0825ed261111818e25fd46..74ac53e23826dc61b36757c35f6d33757cee57f9 100644
--- a/core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java
+++ b/core/src/test/java/hudson/model/ChoiceParameterDefinitionTest.java
@@ -1,7 +1,10 @@
 package hudson.model;
 
+import hudson.util.FormValidation;
+import jenkins.model.Jenkins;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
@@ -14,4 +17,12 @@ public class ChoiceParameterDefinitionTest {
         assertTrue(ChoiceParameterDefinition.areValidChoices("abc\ndef"));
         assertTrue(ChoiceParameterDefinition.areValidChoices("abc\r\ndef"));
     }
+
+    @Test
+    public void testCheckChoices() throws Exception {
+        ChoiceParameterDefinition.DescriptorImpl descriptorImpl = new ChoiceParameterDefinition.DescriptorImpl();
+
+        assertEquals(FormValidation.Kind.OK, descriptorImpl.doCheckChoices("abc\ndef").kind);
+        assertEquals(FormValidation.Kind.ERROR, descriptorImpl.doCheckChoices("").kind);
+    }
 }
diff --git a/test/src/test/java/jenkins/model/JenkinsTest.java b/test/src/test/java/jenkins/model/JenkinsTest.java
index 398d889ebe7e2ff5ac968a57ea6f37c81853a565..d05e231c95330547683cb6ac3186bce2ff2a24a2 100644
--- a/test/src/test/java/jenkins/model/JenkinsTest.java
+++ b/test/src/test/java/jenkins/model/JenkinsTest.java
@@ -311,14 +311,6 @@ public class JenkinsTest extends HudsonTestCase {
         }
     }
 
-    @Test
-    public void testCheckChoices() throws Exception {
-        Jenkins jenkins = Jenkins.getInstance();
-
-        assertEquals(FormValidation.Kind.OK, jenkins.doCheckChoices("abc\ndef").kind);
-        assertEquals(FormValidation.Kind.ERROR, jenkins.doCheckChoices("").kind);
-    }
-
     private String eval(WebClient wc) throws Exception {
         WebRequestSettings req = new WebRequestSettings(new URL(wc.getContextPath() + "eval"), HttpMethod.POST);
         req.setRequestBody("<j:jelly xmlns:j='jelly:core'>${1+2}</j:jelly>");