diff --git a/project/MultiNode.scala b/project/MultiNode.scala
index efaf7864d5..c0fd461150 100644
--- a/project/MultiNode.scala
+++ b/project/MultiNode.scala
@@ -30,9 +30,9 @@ object MultiNode extends AutoPlugin {
     val multiNode = CliOption("pekko.test.multi-node", false)
     val sbtLogNoFormat = CliOption("sbt.log.noformat", false)
 
-    val hostsFileName = sys.props.get("akka.test.multi-node.hostsFileName").toSeq
-    val javaName = sys.props.get("akka.test.multi-node.java").toSeq
-    val targetDirName = sys.props.get("akka.test.multi-node.targetDirName").toSeq
+    val hostsFileName = sys.props.get("pekko.test.multi-node.hostsFileName").toSeq
+    val javaName = sys.props.get("pekko.test.multi-node.java").toSeq
+    val targetDirName = sys.props.get("pekko.test.multi-node.targetDirName").toSeq
   }
 
   val multiExecuteTests =
diff --git a/project/SigarLoader.scala b/project/SigarLoader.scala
index ea14eb82e8..b82cd73ed3 100644
--- a/project/SigarLoader.scala
+++ b/project/SigarLoader.scala
@@ -15,7 +15,7 @@ object SigarLoader {
   import Dependencies.Compile.Provided.sigarLoader
 
   /** Enable Sigar java agent injection during tests. */
-  lazy val sigarTestEnabled = sys.props.get("akka.test.sigar").getOrElse("false").toBoolean
+  lazy val sigarTestEnabled = sys.props.get("pekko.test.sigar").getOrElse("false").toBoolean
 
   lazy val sigarArtifact = TaskKey[File]("sigar-artifact", "Location of Sigar java agent jar.")