diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
index 2c9ddff34805..842b4b1f486e 100644
--- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala
@@ -44,7 +44,7 @@ private[deploy] class SparkSubmitArguments(args: Seq[String], env: Map[String, S
   var maybeMaster: Option[String] = None
   // Global defaults. These should be keep to minimum to avoid confusing behavior.
   def master: String =
-    maybeMaster.getOrElse(System.getProperty("spark.test.master", "local[*]"))
+    maybeMaster.getOrElse(System.getProperty("spark.master", "local[*]"))
   var maybeRemote: Option[String] = None
   var deployMode: String = null
   var executorMemory: String = null