diff --git a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java
index ff107bdd0fd..9c0f1b1414f 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java
@@ -54,7 +54,7 @@
 import com.netscape.cmstools.ca.CACLI;
 import com.netscape.cmstools.ca.CACertCLI;
 import com.netscape.cmstools.client.ClientCLI;
-import com.netscape.cmstools.group.GroupCLI;
+import com.netscape.cmstools.group.ProxyGroupCLI;
 import com.netscape.cmstools.key.KeyCLI;
 import com.netscape.cmstools.kra.KRACLI;
 import com.netscape.cmstools.ocsp.OCSPCLI;
@@ -103,7 +103,7 @@ public MainCLI() throws Exception {
         addModule(new ClientCLI(this));
 
         addModule(new ProxyCLI(new CACertCLI(this), "ca"));
-        addModule(new ProxyCLI(new GroupCLI(this), "ca"));
+        addModule(new ProxyGroupCLI(this));
         addModule(new ProxyCLI(new KeyCLI(this), "kra"));
         addModule(new ProxyCLI(new SecurityDomainCLI(this), "ca"));
         addModule(new ProxyUserCLI(this));
diff --git a/base/java-tools/src/com/netscape/cmstools/group/ProxyGroupCLI.java b/base/java-tools/src/com/netscape/cmstools/group/ProxyGroupCLI.java
new file mode 100644
index 00000000000..029dbb39011
--- /dev/null
+++ b/base/java-tools/src/com/netscape/cmstools/group/ProxyGroupCLI.java
@@ -0,0 +1,38 @@
+// --- BEGIN COPYRIGHT BLOCK ---
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; version 2 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// (C) 2018 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+
+package com.netscape.cmstools.group;
+
+import com.netscape.cmstools.cli.CLI;
+import com.netscape.cmstools.cli.ProxyCLI;
+
+/**
+ * @deprecated pki group has been deprecated. Use pki <subsystem>-group instead.
+ */
+@Deprecated
+public class ProxyGroupCLI extends ProxyCLI {
+
+    public ProxyGroupCLI(CLI parent) {
+        super(new GroupCLI(parent), "ca");
+    }
+
+    public void execute(String[] args) throws Exception {
+        System.err.println("WARNING: pki group has been deprecated. Use pki <subsystem>-group instead.");
+        super.execute(args);
+    }
+}