diff --git a/cmake/CliFboss2Test.cmake b/cmake/CliFboss2Test.cmake
index fbd094efa1048..f1d9dbcce2274 100644
--- a/cmake/CliFboss2Test.cmake
+++ b/cmake/CliFboss2Test.cmake
@@ -33,6 +33,7 @@ gtest_discover_tests(fboss2_framework_test)
 
 # cmd_test - Command tests from BUCK file
 add_executable(fboss2_cmd_test
+  fboss/cli/fboss2/oss/CmdListConfig.cpp
   fboss/cli/fboss2/test/TestMain.cpp
   fboss/cli/fboss2/test/CmdConfigAppliedInfoTest.cpp
   fboss/cli/fboss2/test/CmdConfigHistoryTest.cpp
@@ -43,6 +44,8 @@ add_executable(fboss2_cmd_test
   fboss/cli/fboss2/test/CmdConfigReloadTest.cpp
   fboss/cli/fboss2/test/CmdConfigSessionDiffTest.cpp
   fboss/cli/fboss2/test/CmdConfigSessionTest.cpp
+  fboss/cli/fboss2/test/CmdGetPcapTest.cpp
+  fboss/cli/fboss2/test/CmdListConfigTest.cpp
   fboss/cli/fboss2/test/CmdSetPortStateTest.cpp
   fboss/cli/fboss2/test/CmdShowAclTest.cpp
   fboss/cli/fboss2/test/CmdShowAgentSslTest.cpp
@@ -54,7 +57,6 @@ add_executable(fboss2_cmd_test
   fboss/cli/fboss2/test/CmdShowL2Test.cpp
   fboss/cli/fboss2/test/CmdShowLldpTest.cpp
   fboss/cli/fboss2/test/CmdShowNdpTest.cpp
-  fboss/cli/fboss2/test/CmdGetPcapTest.cpp
   fboss/cli/fboss2/test/CmdShowAggregatePortTest.cpp
   fboss/cli/fboss2/test/CmdShowCpuPortTest.cpp
   fboss/cli/fboss2/test/CmdShowExampleTest.cpp
diff --git a/fboss/cli/fboss2/test/BUCK b/fboss/cli/fboss2/test/BUCK
index a2c7cf4184584..6247a40c6bab5 100644
--- a/fboss/cli/fboss2/test/BUCK
+++ b/fboss/cli/fboss2/test/BUCK
@@ -73,6 +73,7 @@ cpp_unittest(
         "CmdConfigSessionDiffTest.cpp",
         "CmdConfigSessionTest.cpp",
         "CmdGetPcapTest.cpp",
+        "CmdListConfigTest.cpp",
         "CmdSetPortStateTest.cpp",
         "CmdShowAclTest.cpp",
         "CmdShowAgentSslTest.cpp",
diff --git a/fboss/cli/fboss2/test/CmdListConfigTest.cpp b/fboss/cli/fboss2/test/CmdListConfigTest.cpp
new file mode 100644
index 0000000000000..72823dd6afeca
--- /dev/null
+++ b/fboss/cli/fboss2/test/CmdListConfigTest.cpp
@@ -0,0 +1,30 @@
+/*
+ *  Copyright (c) 2004-present, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ *
+ */
+
+#include <gtest/gtest.h>
+
+#include "fboss/cli/fboss2/CmdList.h"
+#include "fboss/cli/fboss2/CmdSubcommands.h"
+
+namespace facebook::fboss {
+
+// This test verifies that the command trees can be successfully registered
+// with CLI11 without throwing CLI::OptionAlreadyAdded exceptions due to
+// duplicate subcommand names.
+TEST(CmdListConfigTest, noDuplicateSubcommands) {
+  CLI::App app{"Test CLI"};
+
+  // This will throw CLI::OptionAlreadyAdded if there are duplicate subcommands
+  EXPECT_NO_THROW(
+      CmdSubcommands().init(
+          app, kCommandTree(), kAdditionalCommandTree(), kSpecialCommands()));
+}
+
+} // namespace facebook::fboss