diff --git a/src/commands/android_build.yml b/src/commands/android_build.yml
index 68bd274..59f7cb1 100644
--- a/src/commands/android_build.yml
+++ b/src/commands/android_build.yml
@@ -9,6 +9,10 @@ parameters:
     description: The build type to build. This is normally either "debug" or "release" but you may have custom build types configured for your app.
     type: string
     default: "debug"
+  test_build_type:
+    description: The test build type to build. This is normally either "debug" or "release" but you may have custom build types configured for your app.
+    type: string
+    default: "debug"
   cache:
     description: Save and restore the caches? Defaults to true
     type: boolean
@@ -73,7 +77,7 @@ steps:
 
   - run:
       name: Build Android APK
-      command: "cd <<parameters.project_path>> && chmod +x gradlew && ./gradlew --build-cache --max-workers 2 --continue assemble<<parameters.build_type>> <<parameters.assemble_android_test>> -DtestBuildType=<<parameters.build_type>> --stacktrace"
+      command: "cd <<parameters.project_path>> && chmod +x gradlew && ./gradlew --build-cache --max-workers 2 --continue assemble<<parameters.build_type>> <<parameters.assemble_android_test>> -DtestBuildType=<<parameters.test_build_type>> --stacktrace"
 
   - when:
       condition: <<parameters.cache>>
diff --git a/src/jobs/android_build.yml b/src/jobs/android_build.yml
index e07c778..a321d67 100644
--- a/src/jobs/android_build.yml
+++ b/src/jobs/android_build.yml
@@ -39,6 +39,10 @@ parameters:
     description: The build type to build. This is normally either "debug" or "release" but you may have custom build types configured for your app.
     type: string
     default: "debug"
+  test_build_type:
+    description: The test build type to build. This is normally either "debug" or "release" but you may have custom build types configured for your app.
+    type: string
+    default: "debug"
   build_cache:
     description: Should we cache after Gradle build? Defaults to true
     type: boolean
@@ -92,6 +96,7 @@ steps:
   - android_build:
       project_path: <<parameters.project_path>>
       build_type: <<parameters.build_type>>
+      test_build_type: <<parameters.test_build_type>>
       cache: <<parameters.build_cache>>
       assemble_android_test: <<parameters.assemble_android_test>>
   - when: