diff --git a/build.gradle b/build.gradle
index 7fba0d5a8..62d6a17ca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ configurations {
 
 idea {
   module {
-    testSourceDirs += file('src/inttest/java')
+    testSources = files(file("src/test/java"), file("src/inttest/java"))
   }
 }
 
@@ -67,7 +67,7 @@ configurations {
 }
 
 
-task inttest(type: Test) {
+tasks.register('inttest', Test) {
   group = LifecycleBasePlugin.VERIFICATION_GROUP
   description = "Runs the integration tests."
 
@@ -106,13 +106,14 @@ configurations {
   codacy
 }
 
-task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) {
+tasks.register('sendCoverageToCodacy', JavaExec) {
+  dependsOn jacocoTestReport
   mainClass = "com.codacy.CodacyCoverageReporter"
   classpath = configurations.codacy
   args = ["report", "-l", "Java", "-r", "${buildDir}/reports/jacoco/test/jacocoTestReport.xml"]
 }
 
-configurations.all {
+configurations.configureEach {
   // Cache -SNAPSHOT for 60 seconds only
   resolutionStrategy.cacheChangingModulesFor 60, 'seconds'
 }
@@ -129,6 +130,9 @@ test {
 processAot {
   environment("FAF_DOMAIN", "faforever.com")
   environment("API_PROFILE", "")
+  environment("CHALLONGE_KEY", "test")
+  environment("GITHUB_ACCESS_TOKEN", "test")
+  environment("MAIL_HOST", "test")
 }
 
 processTestAot {