diff --git a/core/src/main/java/hudson/cli/CLIAction.java b/core/src/main/java/hudson/cli/CLIAction.java
index ca576466316f813f09d405f301b865eddea2427f..dd5327f0cf8b664f97aa3f327393a9fa79870fed 100644
--- a/core/src/main/java/hudson/cli/CLIAction.java
+++ b/core/src/main/java/hudson/cli/CLIAction.java
@@ -68,7 +68,7 @@ public class CLIAction implements UnprotectedRootAction, StaplerProxy {
     }
 
     public String getUrlName() {
-        return "/cli";
+        return "cli";
     }
 
     public void doCommand(StaplerRequest req, StaplerResponse rsp) throws ServletException, IOException {
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index e6898597284f59f67f1f9bf55e3d62bae34e1798..1929e8dd2dda12bcc95ebccdd1e47ed8dfe7511c 100755
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -3667,7 +3667,6 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
             || rest.startsWith("/tcpSlaveAgentListener")
             // TODO SlaveComputer.doSlaveAgentJnlp; there should be an annotation to request unprotected access
             || rest.matches("/computer/[^/]+/slave-agent[.]jnlp") && "true".equals(Stapler.getCurrentRequest().getParameter("encrypt"))
-            || rest.startsWith("/cli")
             || rest.startsWith("/federatedLoginService/")
             || rest.startsWith("/securityRealm"))
                 return this;    // URLs that are always visible without READ permission
diff --git a/test/src/test/groovy/hudson/cli/CLIActionTest.groovy b/test/src/test/groovy/hudson/cli/CLIActionTest.groovy
index 985ab0dfdb3ae2ad0363128abd73e883ba8bd8e5..d4cbd26abc910e2d08b6fe40c11d5b6a3986e2c1 100644
--- a/test/src/test/groovy/hudson/cli/CLIActionTest.groovy
+++ b/test/src/test/groovy/hudson/cli/CLIActionTest.groovy
@@ -1,17 +1,19 @@
 package hudson.cli
 
 import hudson.remoting.Channel
+import hudson.security.FullControlOnceLoggedInAuthorizationStrategy;
+
 import org.junit.Rule
 import org.junit.Test
 import org.jvnet.hudson.test.JenkinsRule
+import org.jvnet.hudson.test.HudsonTestCase.WebClient;
 
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 
 /**
- *
- *
  * @author Kohsuke Kawaguchi
+ * @author christ66
  */
 class CLIActionTest {
     @Rule
@@ -33,4 +35,15 @@ class CLIActionTest {
             pool.shutdown();
         }
     }
+
+    @Test
+    public void serveCliActionToAnonymousUser() throws Exception {
+        def wc = j.createWebClient();
+        wc.goTo("cli"); // Verify user can see cli before security
+
+        j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
+        j.jenkins.setAuthorizationStrategy(new FullControlOnceLoggedInAuthorizationStrategy());
+
+        wc.goTo("cli"); // and after security enabled.
+    }
 }
diff --git a/test/src/test/java/hudson/cli/CLIActionTest.java b/test/src/test/java/hudson/cli/CLIActionTest.java
deleted file mode 100644
index 316a37bfffee65103b1f3cfb86368a9e6082191a..0000000000000000000000000000000000000000
--- a/test/src/test/java/hudson/cli/CLIActionTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2013 christ66
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package hudson.cli;
-
-import hudson.security.FullControlOnceLoggedInAuthorizationStrategy;
-import org.jvnet.hudson.test.HudsonTestCase;
-
-/**
- * A Test unit to verify that CLIAction has .
- *
- * @author christ66
- */
-public class CLIActionTest extends HudsonTestCase {
-    public void testCliActionUnprotectedRootActionTest() throws Exception {
-        WebClient wc = createWebClient();
-        wc.goTo("cli"); // Verify user can see cli before security
-
-        jenkins.setSecurityRealm(createDummySecurityRealm());
-        jenkins.setAuthorizationStrategy(new FullControlOnceLoggedInAuthorizationStrategy());
-
-        wc.goTo("cli"); // and after security enabled.
-    }
-}