diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt
index 4a2252d2..d9752f66 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt
@@ -171,7 +171,7 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
                 val result = KFiles.makeDir(KFiles.generatedSourceDir(project, this, "buildConfig"))
                 // Make sure the generatedSourceDirectory doesn't contain the project.directory since
                 // that directory will be added when trying to find recursively all the sources in it
-                generatedSourceDirectory = File(result.relativeTo(File(project.directory)).absolutePath)
+                generatedSourceDirectory = result.relativeTo(File(project.directory))
                 val outputGeneratedSourceDirectory = File(result, pkg.replace('.', File.separatorChar))
                 val outputDir = File(outputGeneratedSourceDirectory, "BuildConfig." + contributor.buildConfigSuffix)
                 KFiles.saveFile(outputDir, code)
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
index f5656e88..fcf5b3fc 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
@@ -161,13 +161,16 @@ open class JvmCompilerPlugin @Inject constructor(
     private fun doTaskCompileTest(project: Project) = doTaskCompile(project, isTest = true)
 
     private fun doTaskCompile(project: Project, isTest: Boolean): TaskResult {
-        // Set up the source files now that we have the variant
-        sourceDirectories.addAll(context.variant.sourceDirectories(project, context, SourceSet.of(isTest)))
-
+        // Generate the BuildConfig before invoking sourceDirectories() since that call
+        // might add the buildConfig source directori
         val sourceDirectory = context.variant.maybeGenerateBuildConfig(project, context)
         if (sourceDirectory != null) {
             sourceDirectories.add(sourceDirectory)
         }
+
+        // Set up the source files now that we have the variant
+        sourceDirectories.addAll(context.variant.sourceDirectories(project, context, SourceSet.of(isTest)))
+
         val results = arrayListOf<TaskResult>()
 
         val compilerContributors = ActorUtils.selectAffinityActors(project, context,