--- a/build.xml
+++ b/build.xml
@@ -27,6 +27,13 @@
         <equals arg1="${ant.java.version}" arg2="1.9" />
     </condition>
 
+    <!-- Java classpath addition (all jar files to compile tests with this) -->
+    <path id="classpath">
+        <fileset dir="lib">
+            <include name="**/*.jar"/>
+        </fileset>
+    </path>
+
     <!--
       ** Used by Eclipse ant builder for updating
       ** the REVISION file used by JOSM
@@ -201,7 +208,7 @@ Build-Date: ${build.tstamp}
     </target>
     <target name="compile" depends="init,javacc">
         <!-- COTS -->
-        <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
+        <javac srcdir="${src.dir}" classpathref="classpath" nowarn="on" encoding="UTF-8"
             destdir="build" target="1.7" source="1.7" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
             <!-- get rid of "internal proprietary API" warning -->
             <compilerarg value="-XDignore.symbol.file"/>