diff --git a/credentials/development/gen_commissioner_dut_test_plan_table.py b/credentials/development/gen_commissioner_dut_test_plan_table.py
index fb3ca49087e0b7..450f1c7d7c0da3 100755
--- a/credentials/development/gen_commissioner_dut_test_plan_table.py
+++ b/credentials/development/gen_commissioner_dut_test_plan_table.py
@@ -86,8 +86,7 @@ def main():
         with open(path, 'r') as f:
             j = json.loads(f.read())
             success_expected = j['is_success_case'].lower() == 'true'
-            pid = 177 if 'fallback_encoding' in p else 32768
-            desc = TestInfo(desc=j['description'], dir=p, pid=pid)
+            desc = TestInfo(desc=j['description'], dir=p, pid=int(j['basic_info_pid']))
             if success_expected:
                 success_cases.append(desc)
             else: