diff --git a/affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt b/affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt
index c058be6..ed5af51 100644
--- a/affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt
+++ b/affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt
@@ -48,11 +48,11 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
 
         registerSubprojectConfiguration(project)
         registerMainConfiguration(project)
-        registerCustomTasks(project)
-        registerTestTasks(project)
 
         project.gradle.projectsEvaluated {
             AffectedModuleDetector.configure(project)
+            registerCustomTasks(project)
+            registerTestTasks(project)
             filterAndroidTests(project)
             filterJvmTests(project)
             filterCustomTasks(project)
@@ -78,9 +78,7 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
     private fun registerCustomTasks(rootProject: Project) {
         val mainConfiguration = requireConfiguration(rootProject)
 
-        rootProject.afterEvaluate {
-            registerCustomTasks(rootProject, mainConfiguration.customTasks)
-        }
+        registerCustomTasks(rootProject, mainConfiguration.customTasks)
     }
 
     @VisibleForTesting