diff --git a/project/MultiNode.scala b/project/MultiNode.scala
index d7e0a3aa07..7c32bcd4cf 100644
--- a/project/MultiNode.scala
+++ b/project/MultiNode.scala
@@ -62,7 +62,6 @@ object MultiNode extends AutoPlugin {
         jvmOptions in MultiJvm := defaultMultiJvmOptions,
         compileInputs in (MultiJvm, compile) := ((compileInputs in (MultiJvm, compile)) dependsOn (ScalariformKeys.format in MultiJvm)).value,
         scalacOptions in MultiJvm := (scalacOptions in Test).value,
-        compile in MultiJvm := ((compile in MultiJvm) triggeredBy (compile in Test)).value,
         logLevel in multiJvmCreateLogger := Level.Debug, //  to see ssh establishment
         multiJvmCreateLogger in MultiJvm := { // to use normal sbt logging infra instead of custom sbt-multijvm-one
           val previous = (multiJvmCreateLogger in MultiJvm).value
@@ -100,7 +99,10 @@ object MultiNode extends AutoPlugin {
      Def.settings((compile in MultiJvm) := {
       (headerCreate in MultiJvm).value
       (compile in MultiJvm).value
-    }) ++ headerSettings(MultiJvm)
+    }) ++ headerSettings(MultiJvm) ++ Seq(
+      // only works if I put it here ¯\_(ツ)_/¯
+      compile in MultiJvm := ((compile in MultiJvm).triggeredBy(compile in Test)).value
+    )
 
 
   implicit class TestResultOps(val self: TestResult) extends AnyVal {
diff --git a/project/ValidatePullRequest.scala b/project/ValidatePullRequest.scala
index b7cb0d7861..66eed344fa 100644
--- a/project/ValidatePullRequest.scala
+++ b/project/ValidatePullRequest.scala
@@ -270,12 +270,12 @@ object ValidatePullRequest extends AutoPlugin {
 */
 object MultiNodeWithPrValidation extends AutoPlugin {
   import ValidatePullRequest._
-
+  import com.typesafe.sbt.MultiJvmPlugin.MultiJvmKeys.MultiJvm
   override def trigger = allRequirements
   override def requires = ValidatePullRequest && MultiNode
   override lazy val projectSettings =
     if (MultiNode.multiNodeTestInTest) Seq(additionalTasks in ValidatePR += MultiNode.multiTest)
-    else Nil
+    else Seq.empty
 }
 
 /**