diff --git a/spark-class b/spark-class
index 4fa6fb864e3d2156d6f85ca727d0e8eabed629f5..ff51fbd557eba57560b95286bb8d871f86881e37 100755
--- a/spark-class
+++ b/spark-class
@@ -124,7 +124,7 @@ fi
 
 # Compute classpath using external script
 CLASSPATH=`$FWDIR/bin/compute-classpath.sh`
-CLASSPATH="$SPARK_TOOLS_JAR:$CLASSPATH"
+CLASSPATH="$CLASSPATH:$SPARK_TOOLS_JAR"
 export CLASSPATH
 
 if [ "$SPARK_PRINT_LAUNCH_COMMAND" == "1" ]; then
diff --git a/spark-class2.cmd b/spark-class2.cmd
index 3869d0761bfaa8e7ba0e3688b1ec23f8e8a56d87..a60c17d0502eef84800609d5d0a9aaa87be2a4d3 100644
--- a/spark-class2.cmd
+++ b/spark-class2.cmd
@@ -75,7 +75,7 @@ rem Compute classpath using external script
 set DONT_PRINT_CLASSPATH=1
 call "%FWDIR%bin\compute-classpath.cmd"
 set DONT_PRINT_CLASSPATH=0
-set CLASSPATH=%SPARK_TOOLS_JAR%;%CLASSPATH%
+set CLASSPATH=%CLASSPATH%;%SPARK_TOOLS_JAR%
 
 rem Figure out where java is.
 set RUNNER=java