diff --git a/.yamato/upm-ci-renderstreaming-packages.yml b/.yamato/upm-ci-renderstreaming-packages.yml
index fa92ec8a4..f7406f37b 100644
--- a/.yamato/upm-ci-renderstreaming-packages.yml
+++ b/.yamato/upm-ci-renderstreaming-packages.yml
@@ -410,4 +410,38 @@ publish_{{ package.name }}:
     - .yamato/upm-ci-renderstreaming-packages.yml#trigger_test_{{ package.name }}_{{ editor.version }}
 {% endif %}
 {% endfor %}
+
+{% for platform in platforms %}
+{% if platform.name != "macos" and platform.name != "macos-m1" %}
+{% for editor in editors %}
+codecoverage_{{ package.packagename }}_{{ platform.name }}_{{ editor.version }}:
+  name: Code coverage {{ package.packagename }} {{ platform.name }} {{ editor.version }}
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+  commands:
+    - pip config set global.index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
+    - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
+    - npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }}
+{% if platform.name == "win" %}
+    - |
+      set WEBAPP_PATH=%cd%\Webapp\bin~\{{ platform.packed_webapp_name }}
+      upm-ci package test -u {{ editor.version }} --package-path {{ package.packagename }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;generateBadgeReport;assemblyFilters:-UnityEngine.*,+Unity.RenderStreaming" --extra-utr-arg="--timeout=3000"
+{% else %}
+    - |
+      export WEBAPP_PATH=$(pwd)/WebApp/bin~/{{ platform.packed_webapp_name }}
+      upm-ci package test -u {{ editor.version }} --package-path {{ package.packagename }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;generateBadgeReport;assemblyFilters:-UnityEngine.*,+Unity.RenderStreaming" --extra-utr-arg="--timeout=3000"
+{% endif %}
+  artifacts:
+    {{ package.name }}_{{ editor.version }}_{{ platform.name }}_coverage_results:
+      paths:
+        - "upm-ci~/test-results/**"
+  dependencies:
+    - .yamato/upm-ci-renderstreaming-packages.yml#pack_{{ package.name }}
+    - .yamato/upm-ci-webapp.yml#pack_{{ platform.packed_webapp_platform }}
+{% endfor %}
+{% endif %}
+{% endfor %}
+
 {% endfor %}
diff --git a/com.unity.renderstreaming/Runtime/Unity.RenderStreaming.Runtime.asmdef b/com.unity.renderstreaming/Runtime/Unity.RenderStreaming.Runtime.asmdef
index f407ecf44..68ad48530 100644
--- a/com.unity.renderstreaming/Runtime/Unity.RenderStreaming.Runtime.asmdef
+++ b/com.unity.renderstreaming/Runtime/Unity.RenderStreaming.Runtime.asmdef
@@ -1,5 +1,5 @@
 {
-    "name": "Unity.RenderStreaming.Runtime",
+    "name": "Unity.RenderStreaming",
     "rootNamespace": "",
     "references": [
         "Unity.InputSystem",
diff --git a/com.unity.renderstreaming/Samples~/Example/Unity.RenderStreaming.Samples.asmdef b/com.unity.renderstreaming/Samples~/Example/Unity.RenderStreaming.Samples.asmdef
index c3fde343d..7aeb59930 100644
--- a/com.unity.renderstreaming/Samples~/Example/Unity.RenderStreaming.Samples.asmdef
+++ b/com.unity.renderstreaming/Samples~/Example/Unity.RenderStreaming.Samples.asmdef
@@ -5,7 +5,7 @@
         "Unity.InputSystem",
         "Unity.XR.ARFoundation",
         "Unity.XR.ARSubsystems",
-        "Unity.RenderStreaming.Runtime",
+        "Unity.RenderStreaming",
         "Unity.RenderStreaming.Sample.Stats"
     ],
     "includePlatforms": [],