diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle
index 496f12ae2..2bfb0151f 100644
--- a/test-app/app/build.gradle
+++ b/test-app/app/build.gradle
@@ -1113,3 +1113,11 @@ tasks.configureEach({ DefaultTask currentTask ->
         currentTask.finalizedBy(buildMetadata)
     }
 })
+
+rootProject.subprojects.forEach {
+    it.tasks.configureEach({ DefaultTask currentTask ->
+        if (currentTask =~ /.+bundleLibCompileToJar.*/) {
+            currentTask.finalizedBy(cleanupAllJars)
+        }
+    })
+}
diff --git a/test-app/runtime/build.gradle b/test-app/runtime/build.gradle
index 7dd68fa3e..a684a8d3d 100644
--- a/test-app/runtime/build.gradle
+++ b/test-app/runtime/build.gradle
@@ -179,9 +179,6 @@ tasks.configureEach { task ->
         task.finalizedBy createPackageConfigFileTask(taskName)
     }
 
-    if (taskName.contains("bundleLibCompileToJarDebug") || taskName.contains("bundleLibCompileToJarRelease")) {
-        task.dependsOn(":app:cleanupAllJars")
-    }
 
     if (task =~ /configureCMake.*/) {
         task.finalizedBy(":app:buildMetadata")