diff --git a/build-jar.sh b/build-jar.sh
index e072edfb..99aefdf8 100755
--- a/build-jar.sh
+++ b/build-jar.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 if git submodule status | grep \( > /dev/null ; then 
     mkdir -p build
-    find src -name "*.java" | xargs javac -d build
+    find src -name "*.java" | xargs javac -encoding utf-8 -d build
     if [[ "$OSTYPE" == "darwin"* ]]; then
         find src -type f -not -name "*.java" -exec rsync -R {} build \;
     else
diff --git a/test.sh b/test.sh
index fe1fd0cd..7b74adc7 100755
--- a/test.sh
+++ b/test.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
-javac -cp rars.jar test/Test.java
-java -cp test:rars.jar Test
+javac -encoding utf-8 -cp rars.jar test/Test.java
+if [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "cygwin" ]]; then
+	java -Dfile.encoding=UTF8 -cp "test;rars.jar" Test
+else
+	java -Dfile.encoding=UTF8 -cp test:rars.jar Test
+fi
 rm test/Test.class