diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js
index b52935aa9f4..8c6918ab890 100644
--- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js
+++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js
@@ -92,7 +92,7 @@ Wysiwyg.include({
      */
     _loadIframe: function () {
         var self = this;
-        this.$iframe = $('<iframe class="wysiwyg_iframe">').css({
+        this.$iframe = $('<iframe class="wysiwyg_iframe o_iframe">').css({
             'min-height': '55vh',
             width: '100%'
         });
diff --git a/addons/web_tour/static/src/js/tour_manager.js b/addons/web_tour/static/src/js/tour_manager.js
index 8b369eb6e94..8e180c96150 100644
--- a/addons/web_tour/static/src/js/tour_manager.js
+++ b/addons/web_tour/static/src/js/tour_manager.js
@@ -460,7 +460,17 @@ return core.Class.extend(mixins.EventDispatcherMixin, ServicesMixin, {
                 _.each(this._log, function (log) {
                     console.log(log);
                 });
-                console.log(document.body.parentElement.outerHTML);
+                let documentHTML = document.documentElement.outerHTML;
+                // Replace empty iframe tags with their content
+                const iframeEls = Array.from(document.body.querySelectorAll('iframe.o_iframe'));
+                if (iframeEls.length) {
+                    const matches = documentHTML.match(/<iframe[^>]+class=["'][^"']*\bo_iframe\b[^>]+><\/iframe>/g);
+                    for (let i = 0; i < matches.length; i++) {
+                        const iframeWithContent = matches[i].replace(/></, `>${iframeEls[i].contentDocument.documentElement.outerHTML}<`);
+                        documentHTML = documentHTML.replace(matches[i], `\n${iframeWithContent}\n`);
+                    }
+                }
+                console.log(documentHTML);
                 console.error(error); // will be displayed as error info
             } else {
                 console.log(_.str.sprintf("Tour %s succeeded", tour_name));
diff --git a/addons/web_tour/static/src/js/tour_service.js b/addons/web_tour/static/src/js/tour_service.js
index 7c91826c8a8..44a596429e8 100644
--- a/addons/web_tour/static/src/js/tour_service.js
+++ b/addons/web_tour/static/src/js/tour_service.js
@@ -36,6 +36,14 @@ return session.is_bound.then(function () {
         const disabled = session.tour_disable || device.isMobile;
         var tour_manager = new TourManager(rootWidget, consumed_tours, disabled);
 
+        // The tests can be loaded inside an iframe. The tour manager should
+        // not run in that context, as it will already run in its parent
+        // window.
+        const isInIframe = window.frameElement && window.frameElement.classList.contains('o_iframe');
+        if (isInIframe) {
+            return tour_manager;
+        }
+
         function _isTrackedNode(node) {
             if (node.classList) {
                 return !untrackedClassnames
@@ -140,18 +148,61 @@ return session.is_bound.then(function () {
         });
 
         // Now that the observer is configured, we have to start it when needed.
+        const observerOptions = {
+            attributes: true,
+            childList: true,
+            subtree: true,
+            attributeOldValue: true,
+            characterData: true,
+        };
+
         var start_service = (function () {
             return function (observe) {
                 return new Promise(function (resolve, reject) {
                     tour_manager._register_all(observe).then(function () {
                         if (observe) {
-                            observer.observe(document.body, {
-                                attributes: true,
-                                childList: true,
-                                subtree: true,
-                                attributeOldValue: true,
-                                characterData: true,
+                            observer.observe(document.body, observerOptions);
+
+                            // If an iframe is added during the tour, its DOM
+                            // mutations should also be observed to update the
+                            // tour manager.
+                            const findIframe = mutations => {
+                                for (const mutation of mutations) {
+                                    for (const addedNode of Array.from(mutation.addedNodes)) {
+                                        if (addedNode.nodeType === Node.ELEMENT_NODE) {
+                                            if (addedNode.classList.contains('o_iframe')) {
+                                                return addedNode;
+                                            }
+                                            const iframeChildEl = addedNode.querySelector('.o_iframe');
+                                            if (iframeChildEl) {
+                                                return iframeChildEl;
+                                            }
+                                        }
+                                    }
+                                }
+                            };
+                            const iframeObserver = new MutationObserver(mutations => {
+                                const iframeEl = findIframe(mutations);
+                                if (iframeEl) {
+                                    iframeEl.addEventListener('load', () => {
+                                        observer.observe(iframeEl.contentDocument.body, observerOptions);
+                                    });
+                                    // If the iframe was added without a src,
+                                    // its load event was immediately fired and
+                                    // will not fire again unless another src is
+                                    // set. Unfortunately, the case of this
+                                    // happening and the iframe content being
+                                    // altered programmaticaly may happen.
+                                    // (E.g. at the moment this was written,
+                                    // the mass mailing editor iframe is added
+                                    // without src and its content rewritten
+                                    // immediately afterwards).
+                                    if (!iframeEl.src) {
+                                        observer.observe(iframeEl.contentDocument, observerOptions);
+                                    }
+                                }
                             });
+                            iframeObserver.observe(document.body, { childList: true, subtree: true });
                         }
                         resolve();
                     });