diff --git a/bin/spark-shell b/bin/spark-shell
index 0ab4e14f5b74..890a880e4676 100755
--- a/bin/spark-shell
+++ b/bin/spark-shell
@@ -45,6 +45,9 @@ source $FWDIR/bin/utils.sh
 SUBMIT_USAGE_FUNCTION=usage
 gatherSparkSubmitOpts "$@"
 
+# SPARK-4161: scala does not assume use of the java classpath, so we need to add the "-Dscala.usejavacp=true"
+SPARK_SUBMIT_OPTS="$SPARK_SUBMIT_OPTS -Dscala.usejavacp=true"
+
 function main() {
   if $cygwin; then
     # Workaround for issue involving JLine and Cygwin