diff --git a/dom/nfc/tests/marionette/test_nfc_peer.js b/dom/nfc/tests/marionette/test_nfc_peer.js
index 1a000dbe462..2ab480b8101 100644
--- a/dom/nfc/tests/marionette/test_nfc_peer.js
+++ b/dom/nfc/tests/marionette/test_nfc_peer.js
@@ -66,10 +66,7 @@ function testPeerReady() {
 
 function testGetNFCPeer() {
   sysMsgHelper.waitForTechDiscovered(function (msg) {
-    let peer = nfc.getNFCPeer(msg.sessionToken);
-    ok(peer instanceof MozNFCPeer, "Should get a NFCPeer object.");
-    let peer1 = nfc.getNFCPeer(msg.sessionToken);
-    ok(peer == peer1, "Should get the same MozNFCPeer object");
+    ok(msg.peer instanceof MozNFCPeer, "Should get a NFCPeer object.");
 
     NCI.deactivate().then(() => toggleNFC(false)).then(runNextTest);
   });
@@ -181,22 +178,13 @@ function testPeerShouldThrow() {
     .then(() => NCI.activateRE(emulator.P2P_RE_INDEX_0));
 }
 
-function testPeerInvalidToken() {
-  log("testPeerInvalidToken");
-  let peer = nfc.getNFCPeer("fakeSessionToken");
-  is(peer, null, "NFCPeer should be null on wrong session token");
-
-  runNextTest();
-}
-
 let tests = [
   testPeerReady,
   testGetNFCPeer,
   testCheckP2PRegFailure,
   testPeerLostShouldBeCalled,
   testPeerLostShouldNotBeCalled,
-  testPeerShouldThrow,
-  testPeerInvalidToken
+  testPeerShouldThrow
 ];
 
 SpecialPowers.pushPermissions(
diff --git a/dom/nfc/tests/marionette/test_nfc_peer_sendFile.js b/dom/nfc/tests/marionette/test_nfc_peer_sendFile.js
index ee93cf99209..0b1841ec5b2 100644
--- a/dom/nfc/tests/marionette/test_nfc_peer_sendFile.js
+++ b/dom/nfc/tests/marionette/test_nfc_peer_sendFile.js
@@ -8,8 +8,7 @@ let MANIFEST_URL = "app://system.gaiamobile.org/manifest.webapp";
 
 function sendFile(msg) {
   log("sendFile msg="+JSON.stringify(msg));
-  let peer = nfc.getNFCPeer(msg.sessionToken);
-  ok(peer instanceof MozNFCPeer, "should get a MozNFCPeer");
+  ok(msg.peer instanceof MozNFCPeer, "should get a MozNFCPeer");
   ok(msg.blob instanceof Blob, "should get a Blob");
 
   nfc.peerready = null;
diff --git a/dom/nfc/tests/marionette/test_nfc_peer_sendndef.js b/dom/nfc/tests/marionette/test_nfc_peer_sendndef.js
index d4da90e4624..f587d1ee105 100644
--- a/dom/nfc/tests/marionette/test_nfc_peer_sendndef.js
+++ b/dom/nfc/tests/marionette/test_nfc_peer_sendndef.js
@@ -6,13 +6,12 @@ MARIONETTE_HEAD_JS = "head.js";
 
 let url = "https://www.example.com";
 
-function sendNDEF(techType, sessionToken) {
+function sendNDEF(techType, peer) {
   let tnf = NDEF.TNF_WELL_KNOWN;
   let type = new Uint8Array(NfcUtils.fromUTF8("U"));
   let payload = new Uint8Array(NfcUtils.fromUTF8(url));
   let ndef = [new MozNDEFRecord({tnf: tnf, type: type, payload: payload})];
 
-  let peer = window.navigator.mozNfc.getNFCPeer(sessionToken);
   let promise = peer.sendNDEF(ndef);
   promise.then(() => {
     log("Successfully sent NDEF message");
@@ -35,7 +34,7 @@ function handleTechnologyDiscoveredRE0(msg) {
   is(msg.type, "techDiscovered", "check for correct message type");
   let index = msg.techList.indexOf("P2P");
   isnot(index, -1, "check for \'P2P\' in tech list");
-  sendNDEF(msg.techList[index], msg.sessionToken);
+  sendNDEF(msg.techList[index], msg.peer);
 }
 
 function testOnPeerReadyRE0() {