diff --git a/docs/releases.rst b/docs/releases.rst
index 75197aa1fc..f080ed05fe 100644
--- a/docs/releases.rst
+++ b/docs/releases.rst
@@ -4,6 +4,16 @@
     Releases
 ======================
 
+tmt-1.XX.0
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The :ref:`/plugins/report/junit` report plugin now supports a new
+``subresults`` JUnit flavor. This flavor adds support for tmt subresults and
+changes the level of ``<testsuite>`` and ``<testcase>`` tags. By using this
+flavor, the ``tmt.Result`` tags become ``<testsuite>`` tags with one
+``<testcase>`` tag representing the parent result, and possible additional
+``<testcase>`` tags for each ``tmt.result.SubResult``.
+
 
 tmt-1.38.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/tests/report/junit/test.sh b/tests/report/junit/test.sh
index 03612f8426..83b33647eb 100755
--- a/tests/report/junit/test.sh
+++ b/tests/report/junit/test.sh
@@ -79,8 +79,22 @@ rlJournalStart
             rlAssertGrep '<subresult name="/skip-subtest/extra-skip" outcome="skip"/>' "custom-subresults-template-out.xml"
             rlAssertGrep '<result name="/test/shell/subresults/skip" disabled="0" errors="0" failures="0" skipped="1" tests="2" time="0" outcome="pass"' "custom-subresults-template-out.xml"
             rlAssertGrep '<result name="/test/shell/subresults/sleep" disabled="0" errors="0" failures="1" skipped="0" tests="2" time="5"' "custom-subresults-template-out.xml"
+        rlPhaseEnd
 
-            rlAssertGrep '<subresult name="/fail-subtest/good" outcome="pass"/>' "custom-subresults-template-out.xml"
+        rlPhaseStartTest "[$method] Check the 'subresults' flavor"
+            rlRun "tmt run -avr execute -h $method report -h junit --file subresults-out.xml --flavor subresults 2>&1 >/dev/null | tee output" 2
+
+            # Parent result recorded in testuite tag
+            rlAssertGrep '<testsuite name="/test/beakerlib/fail" disabled="0" errors="1" failures="0" skipped="0" tests="1"' "subresults-out.xml"
+            rlAssertGrep '<testsuite name="/test/beakerlib/pass" disabled="0" errors="0" failures="0" skipped="0" tests="1" ' "subresults-out.xml"
+            rlAssertGrep '<testsuite name="/test/shell/fail" disabled="0" errors="1" failures="0" skipped="0" tests="1"'
+
+            # Parent result testsuite must have its respective testcase tag
+            rlAssertGrep '<testcase name="/test/beakerlib/fail">' "subresults-out.xml"
+            rlAssertGrep '<testcase name="/test/beakerlib/pass">' "subresults-out.xml"
+
+            # TODO: Add check for additional subresults as soon as they get saved by:
+            # - https://github.com/teemtee/tmt/pull/3200
         rlPhaseEnd
     done
 
diff --git a/tmt/steps/report/junit.py b/tmt/steps/report/junit.py
index 3b4694c5bb..d586c212a8 100644
--- a/tmt/steps/report/junit.py
+++ b/tmt/steps/report/junit.py
@@ -389,7 +389,7 @@ class ReportJUnitData(tmt.steps.report.ReportStepData):
     flavor: str = field(
         default=DEFAULT_FLAVOR_NAME,
         option='--flavor',
-        choices=[DEFAULT_FLAVOR_NAME, CUSTOM_FLAVOR_NAME],
+        choices=[DEFAULT_FLAVOR_NAME, CUSTOM_FLAVOR_NAME, 'subresults'],
         help='Name of a JUnit flavor to generate.')
 
     template_path: Optional[Path] = field(
diff --git a/tmt/steps/report/junit/schemas/subresults.xsd b/tmt/steps/report/junit/schemas/subresults.xsd
new file mode 100644
index 0000000000..803c09c215
--- /dev/null
+++ b/tmt/steps/report/junit/schemas/subresults.xsd
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+    This schema extends the `default` flavor and adds support for tmt
+    subresults. It allows multiple occurrences of testsuite elements inside a
+    <testsuites>.
+
+    The <testsuite> is mapped to `tmt.Result` and the <testcase> is mapped to
+    `tmt.SubResult`.
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:element name="failure">
+        <xs:complexType mixed="true">
+            <xs:attribute name="type" type="xs:string" use="required"/>
+            <xs:attribute name="message" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="error">
+        <xs:complexType mixed="true">
+            <xs:attribute name="type" type="xs:string" use="required"/>
+            <xs:attribute name="message" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="skipped">
+        <xs:complexType mixed="true">
+            <xs:attribute name="type" type="xs:string" use="required"/>
+            <xs:attribute name="message" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="system-err" type="xs:string"/>
+    <xs:element name="system-out" type="xs:string"/>
+
+    <xs:element name="properties">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="property" maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="property">
+        <xs:complexType>
+            <xs:attribute name="name" type="xs:string" use="required"/>
+            <xs:attribute name="value" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="testcase">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="skipped" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="error" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="failure" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="system-out" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="system-err" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="properties" minOccurs="0" maxOccurs="1"/>
+            </xs:sequence>
+            <xs:attribute name="name" type="xs:string" use="required"/>
+            <xs:attribute name="time" type="xs:float" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="testsuite">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="testcase" minOccurs="0" maxOccurs="unbounded"/>
+
+                <!-- TODO: These should not be probably allowed
+                <xs:element ref="system-out" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="system-err" minOccurs="0" maxOccurs="1"/>
+                -->
+            </xs:sequence>
+            <xs:attribute name="name" type="xs:string" use="required"/>
+            <xs:attribute name="tests" type="xs:string" use="required"/>
+            <xs:attribute name="failures" type="xs:string" use="required"/>
+            <xs:attribute name="errors" type="xs:string" use="required"/>
+            <xs:attribute name="disabled" type="xs:string" use="required"/>
+            <xs:attribute name="skipped" type="xs:string" use="required"/>
+            <xs:attribute name="time" type="xs:float" use="required"/>
+            <xs:attribute name="timestamp" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="testsuites">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="testsuite" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element ref="properties" minOccurs="0" maxOccurs="1"/>
+            </xs:sequence>
+            <xs:attribute name="time" type="xs:float" use="required"/>
+            <xs:attribute name="tests" type="xs:string" use="optional"/>
+            <xs:attribute name="failures" type="xs:string" use="optional"/>
+            <xs:attribute name="disabled" type="xs:string" use="optional"/>
+            <xs:attribute name="errors" type="xs:string" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+</xs:schema>
diff --git a/tmt/steps/report/junit/templates/subresults.xml.j2 b/tmt/steps/report/junit/templates/subresults.xml.j2
new file mode 100644
index 0000000000..f71f2e34a8
--- /dev/null
+++ b/tmt/steps/report/junit/templates/subresults.xml.j2
@@ -0,0 +1,80 @@
+{% extends "_base.xml.j2" %}
+
+{#
+    This flavor changes the level of `<testsuite>` and `<testcase>` tags. The
+    `tmt.Result` becomes ``<testsuite>`` instead of ``testcase`` and
+    ``<testcase>`` tags become ``tmt.SubResult``.
+#}
+
+{% block content %}
+    <testsuites disabled="0" errors="{{ RESULTS.errored | length }}" failures="{{ RESULTS.failed | length }}" tests="{{ RESULTS | length }}" time="{{ RESULTS.duration }}">
+
+    {% block testsuites %}
+        {% for result in RESULTS %}
+            {% set main_log = result.log | first | read_log %}
+            {% set main_log_failures = main_log | failures | e %}
+            {% set main_test_duration = result.duration | duration_to_seconds %}
+
+            {# TODO: Fix the test counts in testsuite tag #}
+            {# TODO: Also fix the counts because now with an additional testcase for parent results, the counts will not match. #}
+
+            <testsuite name="{{ result.name | trim | e }}" disabled="0" errors="{{ result.subresult.errored | length }}" failures="{{ result.subresult.failed | length }}" skipped="{{ result.subresult.skipped | length }}" tests="{{ result.subresult | length }}" time="{{ main_test_duration }}" timestamp="{{ result.start_time }}">
+
+                {#
+                    Always include a `testcase` representing the main result.
+                    The `error/failure/skipped` tags must not exists inside a
+                    `testsuite`, they are only allowed inside of a `testcase`.
+                #}
+                <testcase name="{{ result.name | e }}" {% if result_test_duration %}time="{{ result_test_duration }}"{% endif %}>
+                    {% if result.result.value == 'error' or result.result.value == 'warn' %}
+                        <error type="error" message="{{ result.result.value | e }}">{{ main_log_failures }}</error>
+                    {% elif result.result.value == 'fail' %}
+                        <failure type="failure" message="{{ result.result.value | e }}">{{ main_log_failures }}</failure>
+                    {% elif result.result.value == 'info' %}
+                        <skipped type="skipped" message="{{ result.result.value | e }}">{{ main_log_failures }}</skipped>
+                    {% endif %}
+
+                    {% if INCLUDE_OUTPUT_LOG and main_log %}
+                        <system-out>{{ main_log | e }}</system-out>
+                    {% endif %}
+                </testcase>
+
+                {% for subresult in result.subresult %}
+                    {% set subresult_log = subresult.log | first | read_log %}
+                    {% set subresult_log_failures = main_log | failures | e %}
+                    {% set subresult_test_duration = subresult.duration | duration_to_seconds %}
+
+                    <testcase name="{{ subresult.name | e }}" {% if subresult_test_duration %}time="{{ subresult_test_duration }}"{% endif %}>
+                        {% if subresult.result.value == 'error' or subresult.result.value == 'warn' %}
+                            <error type="error" message="{{ subresult.result.value | e }}">{{ subresult_log_failures }}</error>
+                        {% elif subresult.result.value == 'fail' %}
+                            <failure type="failure" message="{{ subresult.result.value | e }}">{{ subresult_log_failures }}</failure>
+                        {% elif subresult.result.value == 'info' %}
+                            <skipped type="skipped" message="{{ subresult.result.value | e }}">{{ subresult_log_failures }}</skipped>
+                        {% endif %}
+
+                        {% if INCLUDE_OUTPUT_LOG and subresult_log %}
+                            <system-out>{{ subresult_log | e }}</system-out>
+                        {% endif %}
+                    </testcase>
+                {% endfor %}
+
+                {# Optionally add the result properties #}
+                {% if result.properties is defined %}
+                    {% with properties=result.properties %}
+                        {% include "includes/_properties.xml.j2" %}
+                    {% endwith %}
+                {% endif %}
+            </testsuite>
+        {% endfor %}
+    {% endblock %}
+
+    {# Optionally include the properties section in testsuites tag #}
+    {% if RESULTS.properties is defined %}
+        {% with properties=RESULTS.properties %}
+            {% include "includes/_properties.xml.j2" %}
+        {% endwith %}
+    {% endif %}
+
+    </testsuites>
+{% endblock %}