Index: /applications/editors/josm/plugins/build-common.xml
===================================================================
--- /applications/editors/josm/plugins/build-common.xml	(revision 34604)
+++ /applications/editors/josm/plugins/build-common.xml	(revision 34605)
@@ -498,6 +498,9 @@
 
     <path id="test.classpath">
+        <!-- JMockit must be included before JUnit in the classpath -->
+        <pathelement path="${jmockit.jar}"/>
         <fileset dir="../00_core_test_lib">
             <include name="**/*.jar"/>
+            <exclude name="**/jmockit*.jar"/>
         </fileset>
         <fileset dir="${plugin.test.dir}/lib" erroronmissingdir="no">