diff --git a/src/scala/spark/MesosScheduler.scala b/src/scala/spark/MesosScheduler.scala
index 42ad45a56fd79498ffb02c57e4cd0643a10c2519..2face7f08d3fcc756d2ef6503be2ca0f0efd7f0c 100644
--- a/src/scala/spark/MesosScheduler.scala
+++ b/src/scala/spark/MesosScheduler.scala
@@ -208,7 +208,7 @@ class SimpleParallelOperation[T: ClassManifest](
 extends ParallelOperation
 {
   // Maximum time to wait to run a task in a preferred location (in ms)
-  val LOCALITY_WAIT = System.getProperty("spark.locality.wait", "1000").toLong
+  val LOCALITY_WAIT = System.getProperty("spark.locality.wait", "3000").toLong
 
   val callingThread = currentThread
   val numTasks = tasks.length