diff --git a/coin/instructions/cmake_build_and_upload_test_artifacts.yaml b/coin/instructions/cmake_build_and_upload_test_artifacts.yaml
index 0a37ecc602a..ef220e2c112 100644
--- a/coin/instructions/cmake_build_and_upload_test_artifacts.yaml
+++ b/coin/instructions/cmake_build_and_upload_test_artifacts.yaml
@@ -79,3 +79,6 @@ instructions:
         - condition: property
           property: features
           contains_value: DoNotUploadTests
+        - condition: property
+          property: features
+          contains_value: BuildTestsInTest
diff --git a/coin/instructions/cmake_build_tests_in_test_stage.yaml b/coin/instructions/cmake_build_tests_in_test_stage.yaml
new file mode 100644
index 00000000000..420b4331f57
--- /dev/null
+++ b/coin/instructions/cmake_build_tests_in_test_stage.yaml
@@ -0,0 +1,24 @@
+# Builds tests in test workitem.
+# This avoids upload of tests which can be too large to upload to coin.
+
+type: Group
+instructions:
+  - !include "{{qt/qtbase}}/prepare_building_env.yaml"
+  - type: Group
+    instructions:
+      - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts_host.yaml"
+    disable_if:
+      condition: property
+      property: target.osVersion
+      in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
+  - type: Group
+    instructions:
+      - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts_target.yaml"
+    enable_if:
+      condition: property
+      property: target.osVersion
+      in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
+enable_if:
+  condition: property
+  property: features
+  contains_value: BuildTestsInTest
diff --git a/coin/instructions/cmake_regular_test_instructions.yaml b/coin/instructions/cmake_regular_test_instructions.yaml
index 4b21c47b72e..b24b892ea13 100644
--- a/coin/instructions/cmake_regular_test_instructions.yaml
+++ b/coin/instructions/cmake_regular_test_instructions.yaml
@@ -9,6 +9,10 @@ instructions:
     maxTimeBetweenOutput: 1200
     userMessageOnFailure: >
       Failed to install tests archive.
+    enable_if:
+      condition: property
+      property: features
+      not_contains_value: "BuildTestsInTest"
   - type: ChangeDirectory
     directory: "{{.SourceDir}}_standalone_tests"
 
diff --git a/coin/instructions/coin_module_test_template_v3.yaml b/coin/instructions/coin_module_test_template_v3.yaml
index 712389fdace..6f97b448223 100644
--- a/coin/instructions/coin_module_test_template_v3.yaml
+++ b/coin/instructions/coin_module_test_template_v3.yaml
@@ -9,6 +9,7 @@ instructions:
       contains_value: LicenseCheckV2
   - type: Group
     instructions:
+      - !include "{{qt/qtbase}}/cmake_build_tests_in_test_stage.yaml"
       - !include "{{qt/qtbase}}/coin_module_test_template_common.yaml"
       - type: Group
         instructions: