diff --git a/build.gradle b/build.gradle
index 08625784617..57270fa292e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -397,4 +397,14 @@ compileJava.dependsOn updateGitHooks
 
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+}
+
+// The following is required to fix running unit tests during build phase
+tasks.configureEach { task ->
+    if (task.name.startsWith("test")) {
+        task.enabled = true
+    }
+    if (task.name.startsWith("testJunit")) {
+        task.enabled = false
+    }
 }
\ No newline at end of file