diff -r 09c00a304c00 -r 24544e3f183d src/HOL/Library/code_test.ML
--- a/src/HOL/Library/code_test.ML	Fri Apr 21 11:38:45 2017 +0200
+++ b/src/HOL/Library/code_test.ML	Fri Apr 21 13:51:43 2017 +0200
@@ -551,11 +551,11 @@
       "}\n"
 
     val compile_cmd =
-      "\"$SCALA_HOME/bin/scalac\" $ISABELLE_SCALAC_OPTIONS -d " ^ File.bash_path path ^
+      "isabelle_scala scalac $ISABELLE_SCALAC_OPTIONS -d " ^ File.bash_path path ^
       " -classpath " ^ File.bash_path path ^ " " ^
       File.bash_path code_path ^ " " ^ File.bash_path driver_path
 
-    val run_cmd = "\"$SCALA_HOME/bin/scala\" -cp " ^ File.bash_path path ^ " Test"
+    val run_cmd = "isabelle_scala scala -cp " ^ File.bash_path path ^ " Test"
   in
     {files = [(driver_path, driver)],
      compile_cmd = SOME compile_cmd, run_cmd = run_cmd, mk_code_file = K code_path}