diff --git a/examples/chip-tool/commands/common/CHIPCommand.cpp b/examples/chip-tool/commands/common/CHIPCommand.cpp
index 6f204c99d3d799..6d70fc68d8016e 100644
--- a/examples/chip-tool/commands/common/CHIPCommand.cpp
+++ b/examples/chip-tool/commands/common/CHIPCommand.cpp
@@ -23,6 +23,7 @@
 #include <credentials/DeviceAttestationVerifier.h>
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 #include <credentials/examples/DeviceAttestationVerifierExample.h>
+#include <lib/core/CHIPVendorIdentifiers.hpp>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/ScopedBuffer.h>
 
@@ -74,6 +75,7 @@ CHIP_ERROR CHIPCommand::Run()
     commissionerParams.controllerRCAC                 = rcacSpan;
     commissionerParams.controllerICAC                 = icacSpan;
     commissionerParams.controllerNOC                  = nocSpan;
+    commissionerParams.controllerVendorId             = chip::VendorId::TestVendor1;
 
     ReturnLogErrorOnFailure(DeviceControllerFactory::GetInstance().Init(factoryInitParams));
     ReturnLogErrorOnFailure(DeviceControllerFactory::GetInstance().SetupCommissioner(commissionerParams, mController));
diff --git a/src/lib/core/CHIPVendorIdentifiers.hpp b/src/lib/core/CHIPVendorIdentifiers.hpp
index 35b54bc0f6329d..5b8e25b64e22d0 100644
--- a/src/lib/core/CHIPVendorIdentifiers.hpp
+++ b/src/lib/core/CHIPVendorIdentifiers.hpp
@@ -34,10 +34,15 @@ namespace chip {
 // CHIP Vendor Identifiers (16 bits max)
 //
 
+// As per specifications (section 2.5.2 Vendor Identifier)
 enum VendorId : uint16_t
 {
     Common       = 0x0000u,
-    NestLabs     = 0x235Au,
+    GoogleNest   = 0x235Au,
+    TestVendor1  = 0xFFF1u,
+    TestVendor2  = 0xFFF2u,
+    TestVendor3  = 0xFFF3u,
+    TestVendor4  = 0xFFF4u,
     NotSpecified = 0xFFFFu
 };