diff --git a/tests/scripts/scripts/04-test-linking-defined-device-node-target-object-string.lua b/tests/scripts/scripts/04-test-linking-defined-device-node-target-object-string.lua
index a75a9e22..2f440189 100644
--- a/tests/scripts/scripts/04-test-linking-defined-device-node-target-object-string.lua
+++ b/tests/scripts/scripts/04-test-linking-defined-device-node-target-object-string.lua
@@ -29,7 +29,7 @@ SimpleEventHook {
     local name = lnkbl.properties ["node.name"]
     if tu.linkablesReady () and name ~= "stream-node" then
       local props = {
-        ["target.object"] = tu.lnkbls ["defined-device-node"].properties ["node.id"]
+        ["target.object"] = tu.lnkbls ["defined-device-node"].properties ["object.serial"]
       }
       tu.createStreamNode ("playback", props)
     end
diff --git a/tests/scripts/scripts/05-test-linking-defined-device-node-target-object-int.lua b/tests/scripts/scripts/05-test-linking-defined-device-node-target-object-int.lua
index 22ca4a34..7ec66513 100644
--- a/tests/scripts/scripts/05-test-linking-defined-device-node-target-object-int.lua
+++ b/tests/scripts/scripts/05-test-linking-defined-device-node-target-object-int.lua
@@ -29,7 +29,7 @@ SimpleEventHook {
     local name = lnkbl.properties ["node.name"]
     if tu.linkablesReady () and name ~= "stream-node" then
       local props = {
-        ["target.object"] = tonumber (tu.lnkbls ["defined-device-node"].properties ["node.id"]),
+        ["target.object"] = tonumber (tu.lnkbls ["defined-device-node"].properties ["object.serial"]),
       }
       tu.createStreamNode ("playback", props)
     end
diff --git a/tests/scripts/scripts/07-test-linking-defined-device-node-target-object-string-capture.lua b/tests/scripts/scripts/07-test-linking-defined-device-node-target-object-string-capture.lua
index a7f92b43..1d1426c3 100644
--- a/tests/scripts/scripts/07-test-linking-defined-device-node-target-object-string-capture.lua
+++ b/tests/scripts/scripts/07-test-linking-defined-device-node-target-object-string-capture.lua
@@ -29,7 +29,7 @@ SimpleEventHook {
     local name = lnkbl.properties ["node.name"]
     if tu.linkablesReady () and name ~= "stream-node" then
       local props = {
-        ["target.object"] = tu.lnkbls ["defined-device-node"].properties ["node.id"]
+        ["target.object"] = tu.lnkbls ["defined-device-node"].properties ["object.serial"]
       }
       tu.createStreamNode ("capture", props)
     end
diff --git a/tests/scripts/scripts/08-test-linking-defined-device-node-target-object-int-capture.lua b/tests/scripts/scripts/08-test-linking-defined-device-node-target-object-int-capture.lua
index 471a2d1a..dc67beca 100644
--- a/tests/scripts/scripts/08-test-linking-defined-device-node-target-object-int-capture.lua
+++ b/tests/scripts/scripts/08-test-linking-defined-device-node-target-object-int-capture.lua
@@ -29,7 +29,7 @@ SimpleEventHook {
     local name = lnkbl.properties ["node.name"]
     if tu.linkablesReady () and name ~= "stream-node" then
       local props = {
-        ["target.object"] = tonumber (tu.lnkbls ["defined-device-node"].properties ["node.id"]),
+        ["target.object"] = tonumber (tu.lnkbls ["defined-device-node"].properties ["object.serial"]),
       }
       tu.createStreamNode ("capture", props)
     end
diff --git a/tests/scripts/scripts/12-test-linking-defined-device-node-target-node-metadata.lua b/tests/scripts/scripts/12-test-linking-defined-device-node-target-node-metadata.lua
index 1939933c..d73b4221 100644
--- a/tests/scripts/scripts/12-test-linking-defined-device-node-target-node-metadata.lua
+++ b/tests/scripts/scripts/12-test-linking-defined-device-node-target-node-metadata.lua
@@ -33,7 +33,7 @@ SimpleEventHook {
       tu.createStreamNode ("playback")
     elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then
       -- when "stream-node" linkable is ready
-      tu.setTargetInMetadata ("target.node", "defined-device-node")
+      tu.setTargetInMetadata ("target.node", "defined-device-node", "node.id")
     end
   end
 }:register ()
@@ -52,7 +52,7 @@ SimpleEventHook {
   },
   execute = function (event)
     if tu.linkablesReady () then
-      tu.setTargetInMetadata ("target.node", "defined-device-node")
+      tu.setTargetInMetadata ("target.node", "defined-device-node", "node.id")
     end
   end
 }:register ()
diff --git a/tests/scripts/scripts/13-test-linking-defined-device-node-target-node-metadata-capture.lua b/tests/scripts/scripts/13-test-linking-defined-device-node-target-node-metadata-capture.lua
index 8d1d40d6..a5bc1dc1 100644
--- a/tests/scripts/scripts/13-test-linking-defined-device-node-target-node-metadata-capture.lua
+++ b/tests/scripts/scripts/13-test-linking-defined-device-node-target-node-metadata-capture.lua
@@ -33,7 +33,7 @@ SimpleEventHook {
       tu.createStreamNode ("capture")
     elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then
       -- when "stream-node" linkable is ready
-      tu.setTargetInMetadata ("target.node", "defined-device-node")
+      tu.setTargetInMetadata ("target.node", "defined-device-node", "node.id")
     end
   end
 }:register ()
diff --git a/tests/scripts/scripts/14-test-linking-defined-device-node-target-object-metadata.lua b/tests/scripts/scripts/14-test-linking-defined-device-node-target-object-metadata.lua
index 3cd08142..405ffffb 100644
--- a/tests/scripts/scripts/14-test-linking-defined-device-node-target-object-metadata.lua
+++ b/tests/scripts/scripts/14-test-linking-defined-device-node-target-object-metadata.lua
@@ -33,7 +33,7 @@ SimpleEventHook {
       tu.createStreamNode ("playback")
     elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then
       -- when "stream-node" linkable is ready
-      tu.setTargetInMetadata ("target.object", "defined-device-node")
+      tu.setTargetInMetadata ("target.object", "defined-device-node", "object.serial")
     end
   end
 }:register ()
diff --git a/tests/scripts/scripts/15-test-linking-defined-device-node-target-object-metadata-capture.lua b/tests/scripts/scripts/15-test-linking-defined-device-node-target-object-metadata-capture.lua
index 38197918..3d20021d 100644
--- a/tests/scripts/scripts/15-test-linking-defined-device-node-target-object-metadata-capture.lua
+++ b/tests/scripts/scripts/15-test-linking-defined-device-node-target-object-metadata-capture.lua
@@ -33,7 +33,7 @@ SimpleEventHook {
       tu.createStreamNode ("capture")
     elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then
       -- when "stream-node" linkable is ready
-      tu.setTargetInMetadata ("target.object", "defined-device-node")
+      tu.setTargetInMetadata ("target.object", "defined-device-node", "object.serial")
     end
   end
 }:register ()
diff --git a/tests/scripts/scripts/16-test-linking-defined-device-node-target-object-int-metadata.lua b/tests/scripts/scripts/16-test-linking-defined-device-node-target-object-int-metadata.lua
index a3432e02..b81ebbd9 100644
--- a/tests/scripts/scripts/16-test-linking-defined-device-node-target-object-int-metadata.lua
+++ b/tests/scripts/scripts/16-test-linking-defined-device-node-target-object-int-metadata.lua
@@ -32,12 +32,12 @@ SimpleEventHook {
     if tu.linkablesReady () and name ~= "stream-node" then
       -- all linkables created except stream-node
       local props = {
-        ["target.object"] = tu.lnkbls ["defined-device-node-in-props"].properties ["node.id"]
+        ["target.object"] = tu.lnkbls ["defined-device-node-in-props"].properties ["object.serial"]
       }
       tu.createStreamNode ("playback", props)
     elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then
       -- when "stream-node" linkable is ready
-      tu.setTargetInMetadata ("target.object", "defined-device-node-in-metadata")
+      tu.setTargetInMetadata ("target.object", "defined-device-node-in-metadata", "object.serial")
     end
   end
 }:register ()
diff --git a/tests/scripts/scripts/17-test-linking-defined-device-node-target-object-int-metadata-capture.lua b/tests/scripts/scripts/17-test-linking-defined-device-node-target-object-int-metadata-capture.lua
index c04d7f2f..5a828575 100644
--- a/tests/scripts/scripts/17-test-linking-defined-device-node-target-object-int-metadata-capture.lua
+++ b/tests/scripts/scripts/17-test-linking-defined-device-node-target-object-int-metadata-capture.lua
@@ -32,12 +32,12 @@ SimpleEventHook {
     if tu.linkablesReady () and name ~= "stream-node" then
       -- all linkables created except stream-node
       local props = {
-        ["target.object"] = tu.lnkbls ["defined-device-node-in-props"].properties ["node.id"]
+        ["target.object"] = tu.lnkbls ["defined-device-node-in-props"].properties ["object.serial"]
       }
       tu.createStreamNode ("capture", props)
     elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then
       -- when "stream-node" linkable is ready
-      tu.setTargetInMetadata ("target.object", "defined-device-node-in-metadata")
+      tu.setTargetInMetadata ("target.object", "defined-device-node-in-metadata", "object.serial")
     end
   end
 }:register ()
diff --git a/tests/scripts/scripts/lib/test-utils.lua b/tests/scripts/scripts/lib/test-utils.lua
index 33e0973a..032c1edd 100644
--- a/tests/scripts/scripts/lib/test-utils.lua
+++ b/tests/scripts/scripts/lib/test-utils.lua
@@ -97,9 +97,9 @@ u.settings_metadata = cu.get_object_manager ("metadata"):lookup {
 assert (u.settings_metadata ~= nil)
 
 -- update the defined target for stream session item in metadata.
-function u.setTargetInMetadata (prop, target_node_name)
+function u.setTargetInMetadata (prop, target_node_name, target_property)
   u.default_metadata:set (u.lnkbls ["stream-node"].properties ["node.id"], prop,
-      "Spa:Id", u.lnkbls [target_node_name].properties ["node.id"])
+      "Spa:Id", u.lnkbls [target_node_name].properties [target_property])
 end
 
 function u.linkablesReady ()