--- a/browser/extensions/onboarding/test/browser/browser_onboarding_select_default_tour.js
+++ b/browser/extensions/onboarding/test/browser/browser_onboarding_select_default_tour.js
@@ -18,25 +18,23 @@ add_task(async function test_first_tour_
     ["browser.onboarding.newtour", "private,addons,customize"],
   ]});
 
   let tab = await openTab(ABOUT_NEWTAB_URL);
   await promiseOnboardingOverlayLoaded(tab.linkedBrowser);
   await BrowserTestUtils.synthesizeMouseAtCenter(OVERLAY_ICON_ID, {}, tab.linkedBrowser);
   await promiseOnboardingOverlayOpened(tab.linkedBrowser);
 
-  await ContentTask.spawn(tab.linkedBrowser, {}, () => {
-    let doc = content.document;
-    let dom = doc.querySelector(PRIVATE_BROWSING_TOUR_ID);
-    ok(dom.classList.contains(CLASS_ACTIVE));
-    let dom2 = doc.querySelector(ADDONS_TOUR_ID);
-    ok(!dom2.classList.contains(CLASS_ACTIVE));
-    let dom3 = doc.querySelector(CUSTOMIZE_TOUR_ID);
-    ok(!dom3.classList.contains(CLASS_ACTIVE));
-  });
+  let doc = content && content.document;
+  let dom = doc.querySelector(PRIVATE_BROWSING_TOUR_ID);
+  ok(dom.classList.contains(CLASS_ACTIVE));
+  let dom2 = doc.querySelector(ADDONS_TOUR_ID);
+  ok(!dom2.classList.contains(CLASS_ACTIVE));
+  let dom3 = doc.querySelector(CUSTOMIZE_TOUR_ID);
+  ok(!dom3.classList.contains(CLASS_ACTIVE));
 
   await BrowserTestUtils.removeTab(tab);
 });
 
 add_task(async function test_select_first_uncomplete_tour() {
   resetOnboardingDefaultState();
   await SpecialPowers.pushPrefEnv({set: [
     ["browser.onboarding.tour-type", "new"],
@@ -44,26 +42,25 @@ add_task(async function test_select_firs
     ["browser.onboarding.seen-tourset-version", 1],
     ["browser.onboarding.newtour", "private,addons,customize"],
   ]});
   setTourCompletedState("onboarding-tour-private-browsing", true);
 
   let tab = await openTab(ABOUT_NEWTAB_URL);
   await promiseOnboardingOverlayLoaded(tab.linkedBrowser);
   await BrowserTestUtils.synthesizeMouseAtCenter(OVERLAY_ICON_ID, {}, tab.linkedBrowser);
-  await promiseOnboardingOverlayOpened(tab.linkedBrowser);  
-  await ContentTask.spawn(tab.linkedBrowser, {}, () => {
-    let doc = content.document;
-    let dom = doc.querySelector(PRIVATE_BROWSING_TOUR_ID);
-    ok(!dom.classList.contains(CLASS_ACTIVE));
-    let dom2 = doc.querySelector(ADDONS_TOUR_ID);
-    ok(dom2.classList.contains(CLASS_ACTIVE));
-    let dom3 = doc.querySelector(CUSTOMIZE_TOUR_ID);
-    ok(!dom3.classList.contains(CLASS_ACTIVE));
-  });
+  await promiseOnboardingOverlayOpened(tab.linkedBrowser);
+
+  let doc = content && content.document;
+  let dom = doc.querySelector(PRIVATE_BROWSING_TOUR_ID);
+  ok(!dom.classList.contains(CLASS_ACTIVE));
+  let dom2 = doc.querySelector(ADDONS_TOUR_ID);
+  ok(dom2.classList.contains(CLASS_ACTIVE));
+  let dom3 = doc.querySelector(CUSTOMIZE_TOUR_ID);
+  ok(!dom3.classList.contains(CLASS_ACTIVE));
 
   await BrowserTestUtils.removeTab(tab);
 });
 
 add_task(async function test_select_first_tour_when_all_tours_are_complete() {
   resetOnboardingDefaultState();
   await SpecialPowers.pushPrefEnv({set: [
     ["browser.onboarding.tour-type", "new"],
@@ -73,21 +70,20 @@ add_task(async function test_select_firs
   ]});
   setTourCompletedState("onboarding-tour-private-browsing", true);
   setTourCompletedState("onboarding-tour-addons", true);
   setTourCompletedState("onboarding-tour-customize", true);
 
   let tab = await openTab(ABOUT_NEWTAB_URL);
   await promiseOnboardingOverlayLoaded(tab.linkedBrowser);
   await BrowserTestUtils.synthesizeMouseAtCenter(OVERLAY_ICON_ID, {}, tab.linkedBrowser);
-  await promiseOnboardingOverlayOpened(tab.linkedBrowser);  
-  await ContentTask.spawn(tab.linkedBrowser, {}, () => {
-    let doc = content.document;
-    let dom = doc.querySelector(PRIVATE_BROWSING_TOUR_ID);
-    ok(dom.classList.contains(CLASS_ACTIVE));
-    let dom2 = doc.querySelector(ADDONS_TOUR_ID);
-    ok(!dom2.classList.contains(CLASS_ACTIVE));
-    let dom3 = doc.querySelector(CUSTOMIZE_TOUR_ID);
-    ok(!dom3.classList.contains(CLASS_ACTIVE));
-  });
+  await promiseOnboardingOverlayOpened(tab.linkedBrowser);
+
+  let doc = content && content.document;
+  let dom = doc.querySelector(PRIVATE_BROWSING_TOUR_ID);
+  ok(dom.classList.contains(CLASS_ACTIVE));
+  let dom2 = doc.querySelector(ADDONS_TOUR_ID);
+  ok(!dom2.classList.contains(CLASS_ACTIVE));
+  let dom3 = doc.querySelector(CUSTOMIZE_TOUR_ID);
+  ok(!dom3.classList.contains(CLASS_ACTIVE));
 
   await BrowserTestUtils.removeTab(tab);
 });