diff --git a/bin/java-petstore-filemap.sh b/bin/java-petstore-filemap.sh
index 2b4cb2108bc..b8b71151f2b 100755
--- a/bin/java-petstore-filemap.sh
+++ b/bin/java-petstore-filemap.sh
@@ -22,7 +22,7 @@ cd $APP_DIR
 
 
 # if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DfileMap=src/test/resources/petstore-1.1/resources.json -DloggerPath=conf/log4j.properties"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DfileMap=src/test/resources/petstore-1.2/api-docs -DloggerPath=conf/log4j.properties"
 ags="$@ samples/client/petstore/java/JavaPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
 
 if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/*assembly*.jar ]; then
diff --git a/bin/java-petstore.sh b/bin/java-petstore.sh
index d5021052bdd..fee35e8df4a 100755
--- a/bin/java-petstore.sh
+++ b/bin/java-petstore.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 SCRIPT="$0"
+SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +19,14 @@ if [ ! -d "${APP_DIR}" ]; then
 fi
 
 cd $APP_DIR
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="$@ samples/client/petstore/java/JavaPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/*assembly*assembly*.jar ]; then
-  scala -cp $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/*assembly*assembly*.jar $ags
+if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/*assembly*.jar ]; then
+  scala -cp $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/*assembly*.jar $ags
 else
   echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
 fi