diff --git a/src/jobs/build.yml b/src/jobs/build.yml
index 21752fb..d410c6c 100755
--- a/src/jobs/build.yml
+++ b/src/jobs/build.yml
@@ -63,6 +63,12 @@ parameters:
       Whether to compress the build output to a ".tar.gz" archive.
       This is recommended if you want to download the built artifacts from the CircleCI web app.
       If left to "false" for decompressed WebGL builds, you can run the project directly from the CircleCI web app.
+  return-license:
+    type: boolean
+    default: false
+    description: |
+      Whether to return the license used to build the project.
+      Unity only allows returning professional licenses.
 
 executor: << parameters.executor >>
 
@@ -81,6 +87,9 @@ steps:
       project-path: <<parameters.project-path>>
       store-artifacts: <<parameters.store-artifacts>>
       compress: <<parameters.compress>>
-  - return-license:
-      unity-username-var-name: << parameters.unity-username-var-name >>
-      unity-password-var-name: << parameters.unity-password-var-name >>
+  - when:
+      condition: <<parameters.return-license>>
+      steps:
+        - return-license:
+            unity-username-var-name: << parameters.unity-username-var-name >>
+            unity-password-var-name: << parameters.unity-password-var-name >>
diff --git a/src/jobs/test.yml b/src/jobs/test.yml
index 297b54e..f972f44 100644
--- a/src/jobs/test.yml
+++ b/src/jobs/test.yml
@@ -46,6 +46,12 @@ parameters:
       Specify the test platform to run tests on.
       Valid values are "editmode", "playmode" and Unity's target builds.
       More information can be found on: https://docs.unity3d.com/Packages/com.unity.test-framework@2.0/manual/reference-command-line.html
+  return-license:
+    type: boolean
+    default: false
+    description: |
+      Whether to return the license used to test the project.
+      Unity only allows returning professional licenses.
 
 executor: << parameters.executor >>
 
@@ -61,6 +67,9 @@ steps:
       step-name: << parameters.step-name >>
       test-platform: << parameters.test-platform >>
       project-path: << parameters.project-path >>
-  - return-license:
-      unity-username-var-name: << parameters.unity-username-var-name >>
-      unity-password-var-name: << parameters.unity-password-var-name >>
+  - when:
+      condition: <<parameters.return-license>>
+      steps:
+        - return-license:
+            unity-username-var-name: << parameters.unity-username-var-name >>
+            unity-password-var-name: << parameters.unity-password-var-name >>