diff --git a/test/openpower-pels/registry_test.cpp b/test/openpower-pels/registry_test.cpp
index fa1aa0c..08eefc4 100644
--- a/test/openpower-pels/registry_test.cpp
+++ b/test/openpower-pels/registry_test.cpp
@@ -384,6 +384,11 @@
                 {
                     "Priority": "low",
                     "SymbolicFRU": "service_docs"
+                },
+                {
+                    "Priority": "low",
+                    "SymbolicFRUTrusted": "air_mover",
+                    "UseInventoryLocCode": true
                 }
             ]
         },
@@ -408,7 +413,7 @@
         names.push_back("system1");
 
         auto callouts = Registry::getCallouts(json, names, ad);
-        EXPECT_EQ(callouts.size(), 3);
+        EXPECT_EQ(callouts.size(), 4);
         EXPECT_EQ(callouts[0].priority, "high");
         EXPECT_EQ(callouts[0].locCode, "P1-C1");
         EXPECT_EQ(callouts[0].procedure, "");
@@ -424,6 +429,12 @@
         EXPECT_EQ(callouts[2].procedure, "");
         EXPECT_EQ(callouts[2].symbolicFRU, "service_docs");
         EXPECT_EQ(callouts[2].symbolicFRUTrusted, "");
+        EXPECT_EQ(callouts[3].priority, "low");
+        EXPECT_EQ(callouts[3].locCode, "");
+        EXPECT_EQ(callouts[3].procedure, "");
+        EXPECT_EQ(callouts[3].symbolicFRU, "");
+        EXPECT_EQ(callouts[3].symbolicFRUTrusted, "air_mover");
+        EXPECT_EQ(callouts[3].useInventoryLocCode, true);
 
         // system2 isn't in the JSON, so it will pick the default one
         names[0] = "system2";
@@ -438,6 +449,7 @@
         EXPECT_EQ(callouts[1].procedure, "");
         EXPECT_EQ(callouts[1].symbolicFRU, "");
         EXPECT_EQ(callouts[1].symbolicFRUTrusted, "service_docs");
+        EXPECT_EQ(callouts[1].useInventoryLocCode, false);
     }
 
     // Empty JSON array (treated as an error)
diff --git a/test/openpower-pels/src_test.cpp b/test/openpower-pels/src_test.cpp
index fc80d1d..f439bfc 100644
--- a/test/openpower-pels/src_test.cpp
+++ b/test/openpower-pels/src_test.cpp
@@ -670,6 +670,111 @@
     }
 }
 
+// Test that a symbolic FRU with a trusted location code callout
+// from the registry can get its location from the
+// CALLOUT_INVENTORY_PATH AdditionalData entry.
+TEST_F(SRCTest, SymbolicFRUWithInvPathTest)
+{
+    message::Entry entry;
+    entry.src.type = 0xBD;
+    entry.src.reasonCode = 0xABCD;
+    entry.subsystem = 0x42;
+    entry.src.powerFault = false;
+
+    entry.callouts = R"(
+        [{
+            "CalloutList":
+            [
+                {
+                    "Priority": "high",
+                    "SymbolicFRUTrusted": "service_docs",
+                    "UseInventoryLocCode": true
+                },
+                {
+                    "Priority": "medium",
+                    "LocCode": "P0-C8",
+                    "SymbolicFRUTrusted": "pwrsply"
+                }
+            ]
+        }])"_json;
+
+    {
+        // The location code for the first symbolic FRU callout will
+        // come from this inventory path since UseInventoryLocCode is set.
+        // In this case there will be no normal FRU callout for the motherboard.
+        std::vector<std::string> adData{"CALLOUT_INVENTORY_PATH=motherboard"};
+        AdditionalData ad{adData};
+        NiceMock<MockDataInterface> dataIface;
+        std::vector<std::string> names{"systemA"};
+
+        EXPECT_CALL(dataIface, getSystemNames).WillOnce(ReturnRef(names));
+
+        EXPECT_CALL(dataIface, getLocationCode("motherboard"))
+            .Times(1)
+            .WillOnce(Return("Ufcs-P10"));
+
+        EXPECT_CALL(dataIface, expandLocationCode("P0-C8", 0))
+            .WillOnce(Return("Ufcs-P0-C8"));
+
+        SRC src{entry, ad, dataIface};
+
+        auto& callouts = src.callouts()->callouts();
+        EXPECT_EQ(callouts.size(), 2);
+
+        // The location code for the first symbolic FRU callout with a
+        // trusted location code comes from the motherboard.
+        EXPECT_EQ(callouts[0]->locationCode(), "Ufcs-P10");
+        EXPECT_EQ(callouts[0]->priority(), 'H');
+        auto& fru1 = callouts[0]->fruIdentity();
+        EXPECT_EQ(fru1->getPN().value(), "SVCDOCS");
+        EXPECT_EQ(fru1->failingComponentType(),
+                  src::FRUIdentity::symbolicFRUTrustedLocCode);
+
+        // The second trusted symbolic FRU callouts uses the location
+        // code in the registry as usual.
+        EXPECT_EQ(callouts[1]->locationCode(), "Ufcs-P0-C8");
+        EXPECT_EQ(callouts[1]->priority(), 'M');
+        auto& fru2 = callouts[1]->fruIdentity();
+        EXPECT_EQ(fru2->getPN().value(), "PWRSPLY");
+        EXPECT_EQ(fru2->failingComponentType(),
+                  src::FRUIdentity::symbolicFRUTrustedLocCode);
+    }
+
+    {
+        // This time say we want to use the location code from
+        // the inventory, but don't pass it in and the callout should
+        // end up a regular symbolic FRU
+        entry.callouts = R"(
+        [{
+            "CalloutList":
+            [
+                {
+                    "Priority": "high",
+                    "SymbolicFRUTrusted": "service_docs",
+                    "UseInventoryLocCode": true
+                }
+            ]
+        }])"_json;
+
+        AdditionalData ad;
+        NiceMock<MockDataInterface> dataIface;
+        std::vector<std::string> names{"systemA"};
+
+        EXPECT_CALL(dataIface, getSystemNames).WillOnce(ReturnRef(names));
+
+        SRC src{entry, ad, dataIface};
+
+        auto& callouts = src.callouts()->callouts();
+        EXPECT_EQ(callouts.size(), 1);
+
+        EXPECT_EQ(callouts[0]->locationCode(), "");
+        EXPECT_EQ(callouts[0]->priority(), 'H');
+        auto& fru1 = callouts[0]->fruIdentity();
+        EXPECT_EQ(fru1->getPN().value(), "SVCDOCS");
+        EXPECT_EQ(fru1->failingComponentType(), src::FRUIdentity::symbolicFRU);
+    }
+}
+
 // Test looking up device path fails in the callout jSON.
 TEST_F(SRCTest, DevicePathCalloutTest)
 {