diff --git a/.yamato/test.yml b/.yamato/test.yml
index d44d7da79..a52f4798d 100644
--- a/.yamato/test.yml
+++ b/.yamato/test.yml
@@ -1,5 +1,10 @@
-test_editors:
+blocking_test_editors:
   - version: 2019.1.14f1
+nonblocking_test_editors:
+  - version: 2019.3.0f6
+  - version: 2019.4
+  - version: 2020.1
+  - version: 2020.2
 test_platforms:
   - name: win
     type: Unity::VM
@@ -11,7 +16,7 @@ test_platforms:
     flavor: m1.mac
 ---
 
-{% for editor in test_editors %}
+{% for editor in blocking_test_editors %}
 {% for platform in test_platforms %}
 test_{{ platform.name }}_{{ editor.version }}:
   name : Test {{ editor.version }} on {{ platform.name }}
@@ -21,7 +26,27 @@ test_{{ platform.name }}_{{ editor.version }}:
     flavor: {{ platform.flavor}}
   commands:
     - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - {% if platform.name == "centos" %}DISPLAY=:0 {% endif %}upm-ci package test -u {{ editor.version }} --package-path . --type package-tests
+    - {% if platform.name == "centos" %}DISPLAY=:0 {% endif %}upm-ci package test -u {{ editor.version }} --package-path . --type package-tests --enable-code-coverage
+  artifacts:
+    logs:
+      paths:
+        - "upm-ci~/test-results/**/*"
+  dependencies:
+    - .yamato/pack.yml#pack
+{% endfor %}
+{% endfor %}
+
+{% for editor in nonblocking_test_editors %}
+{% for platform in test_platforms %}
+test_{{ platform.name }}_{{ editor.version }}:
+  name : Test {{ editor.version }} on {{ platform.name }}
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor}}
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - {% if platform.name == "centos" %}DISPLAY=:0 {% endif %}upm-ci package test -u {{ editor.version }} --package-path . --type package-tests --enable-code-coverage
   artifacts:
     logs:
       paths:
@@ -33,7 +58,7 @@ test_{{ platform.name }}_{{ editor.version }}:
 
 # Validate the package on each editor version and each platform
 # Validation only occurs in editmode.
-{% for editor in test_editors %}
+{% for editor in blocking_test_editors %}
 {% for platform in test_platforms %}
 validate_{{ platform.name }}_{{ editor.version }}:
   name : Validate {{ editor.version }} on {{ platform.name }}
@@ -65,9 +90,14 @@ test_trigger:
             - "/.*/"
   dependencies:
     - .yamato/pack.yml#pack
-    {% for editor in test_editors %}
+    {% for editor in blocking_test_editors %}
     {% for platform in test_platforms %}
     - .yamato/test.yml#test_{{platform.name}}_{{editor.version}}
     - .yamato/test.yml#validate_{{platform.name}}_{{editor.version}}
     {% endfor %}
     {% endfor %}
+    {% for editor in nonblocking_test_editors %}
+    {% for platform in test_platforms %}
+    - .yamato/test.yml#test_{{platform.name}}_{{editor.version}}
+    {% endfor %}
+    {% endfor %}
\ No newline at end of file