diff --git a/tests/test/jvm/classlist.pp b/tests/test/jvm/classlist.pp
index 19f3fa89b0..23c54f0d81 100644
--- a/tests/test/jvm/classlist.pp
+++ b/tests/test/jvm/classlist.pp
@@ -3,7 +3,7 @@ program classlist;
 {$mode delphi}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
  T1 = class
diff --git a/tests/test/jvm/sort.pp b/tests/test/jvm/sort.pp
index 3e34eefb7f..d9ede1305f 100644
--- a/tests/test/jvm/sort.pp
+++ b/tests/test/jvm/sort.pp
@@ -4,7 +4,7 @@ program sort;
 {$modeswitch unicodestrings}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 function test : string;
 var
diff --git a/tests/test/jvm/tabs.pp b/tests/test/jvm/tabs.pp
index 4ab3739330..ad0e0d54f6 100644
--- a/tests/test/jvm/tabs.pp
+++ b/tests/test/jvm/tabs.pp
@@ -4,7 +4,7 @@ program tabs;
 
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define writeln:=jlsystem.fout.println}
diff --git a/tests/test/jvm/taddset.pp b/tests/test/jvm/taddset.pp
index 0bb13e6642..6f70c5bc5f 100644
--- a/tests/test/jvm/taddset.pp
+++ b/tests/test/jvm/taddset.pp
@@ -25,7 +25,7 @@ Program taddset;
 {$define writeln:=jlsystem.fout.println}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 procedure halt(l: longint);
 begin
diff --git a/tests/test/jvm/taddsetint.pp b/tests/test/jvm/taddsetint.pp
index c21747d44c..9ffb2b8d90 100644
--- a/tests/test/jvm/taddsetint.pp
+++ b/tests/test/jvm/taddsetint.pp
@@ -25,7 +25,7 @@ Program taddsetint;
 {$define writeln:=jlsystem.fout.println}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 procedure halt(l: longint);
 begin
diff --git a/tests/test/jvm/tarray2.pp b/tests/test/jvm/tarray2.pp
index 70243ad5e4..17de2a604f 100644
--- a/tests/test/jvm/tarray2.pp
+++ b/tests/test/jvm/tarray2.pp
@@ -3,7 +3,7 @@ Program tarray2;
 
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define writeln:=jlsystem.fout.println}
diff --git a/tests/test/jvm/tarray3.pp b/tests/test/jvm/tarray3.pp
index ed36400096..6514c18b6a 100644
--- a/tests/test/jvm/tarray3.pp
+++ b/tests/test/jvm/tarray3.pp
@@ -3,7 +3,7 @@ program tarray3;
 {$modeswitch exceptions}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
   
 {$macro on}
 {$define write:=JLSystem.fout.print}
diff --git a/tests/test/jvm/tbyte.pp b/tests/test/jvm/tbyte.pp
index f081d3e73f..38a10fd39d 100644
--- a/tests/test/jvm/tbyte.pp
+++ b/tests/test/jvm/tbyte.pp
@@ -3,7 +3,7 @@ program tbyte;
 {$mode delphi}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 function test: longint;
 var
diff --git a/tests/test/jvm/tbytearrres.pp b/tests/test/jvm/tbytearrres.pp
index 24e278081d..0304bd7b08 100644
--- a/tests/test/jvm/tbytearrres.pp
+++ b/tests/test/jvm/tbytearrres.pp
@@ -3,7 +3,7 @@ program tbytearrres;
 {$mode delphi}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
   ByteArray = array of byte;
diff --git a/tests/test/jvm/tclassproptest.pp b/tests/test/jvm/tclassproptest.pp
index 680e9316eb..28fb2319e1 100644
--- a/tests/test/jvm/tclassproptest.pp
+++ b/tests/test/jvm/tclassproptest.pp
@@ -3,7 +3,7 @@ program tclassproptest;
 {$mode objfpc}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
   tclassprop = class
diff --git a/tests/test/jvm/tcnvstr1.pp b/tests/test/jvm/tcnvstr1.pp
index 164c37a9e9..1efe2fe4fc 100644
--- a/tests/test/jvm/tcnvstr1.pp
+++ b/tests/test/jvm/tcnvstr1.pp
@@ -33,7 +33,7 @@ program tcnvstr1;
 {$define hasshortstring}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 {$H+}
 
 {$macro on}
diff --git a/tests/test/jvm/tcnvstr3.pp b/tests/test/jvm/tcnvstr3.pp
index 8a5773d35f..39dd074bfe 100644
--- a/tests/test/jvm/tcnvstr3.pp
+++ b/tests/test/jvm/tcnvstr3.pp
@@ -19,7 +19,7 @@ program tcnvstr3;
   {$endif}
 {$endif}
 
-uses jdk15;
+uses {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define write:=JLSystem.fout.print}
diff --git a/tests/test/jvm/tconst.pp b/tests/test/jvm/tconst.pp
index aa6fb2c0e6..3434cc08c6 100644
--- a/tests/test/jvm/tconst.pp
+++ b/tests/test/jvm/tconst.pp
@@ -3,7 +3,7 @@ program tconst;
 {$mode delphi}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
   tc = class
diff --git a/tests/test/jvm/tdefpara.pp b/tests/test/jvm/tdefpara.pp
index 1432738274..c2f3944754 100644
--- a/tests/test/jvm/tdefpara.pp
+++ b/tests/test/jvm/tdefpara.pp
@@ -4,7 +4,7 @@ program tdefpara;
 
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define writeln:=jlsystem.fout.println}
diff --git a/tests/test/jvm/tdynarrec.pp b/tests/test/jvm/tdynarrec.pp
index c4ce952df5..e9fee75803 100644
--- a/tests/test/jvm/tdynarrec.pp
+++ b/tests/test/jvm/tdynarrec.pp
@@ -3,7 +3,7 @@ Program tdynarrec;
 {$mode objfpc}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
   tdynrec = record
diff --git a/tests/test/jvm/test.pp b/tests/test/jvm/test.pp
index 539722bf82..fb284714f1 100644
--- a/tests/test/jvm/test.pp
+++ b/tests/test/jvm/test.pp
@@ -162,7 +162,7 @@ var
 implementation
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 { package visibility }
 var
diff --git a/tests/test/jvm/testall.sh b/tests/test/jvm/testall.sh
index c55032f038..c8e0024559 100755
--- a/tests/test/jvm/testall.sh
+++ b/tests/test/jvm/testall.sh
@@ -2,125 +2,130 @@
 
 set -ex
 
+RTLDIR=jvm-java
+
 if [ $# -eq 0 ]; then
-  PPC=ppcppc
+  PPC=ppcjvm
 else
   PPC="$1"
+  if [ $# -eq 2 ]; then
+    RTLDIR="$2"
+  fi
 fi
 
 $PPC -O2 -g unsupported
 $PPC -O2 -g testintf
 $PPC -O2 -g nested
 $PPC -O2 -g test
-javac -encoding utf-8 -cp ../../../rtl/units/jvm-java:. JavaClass.java
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. JavaClass
+javac -encoding utf-8 -cp ../../../rtl/units/$RTLDIR:. JavaClass.java
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. JavaClass
 $PPC -O2 -g sort
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. sort
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. sort
 $PPC -O2 -g classmeth
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. classmeth
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. classmeth
 $PPC -O2 -g classlist
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. classlist
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. classlist
 $PPC -O2 -g testansi
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. testansi
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. testansi
 $PPC -O2 -g tcnvstr1
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tcnvstr1
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tcnvstr1
 $PPC -O2 -g tcnvstr3
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tcnvstr3
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tcnvstr3
 $PPC -O2 -g testshort
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. testshort
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. testshort
 $PPC -O2 -g tarray2
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tarray2
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tarray2
 $PPC -O2 -g tarray3
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tarray3
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tarray3
 $PPC -O2 -g tnestproc
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tnestproc
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tnestproc
 $PPC -O2 -g outpara
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. outpara
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. outpara
 $PPC -O2 -g tbytearrres
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tbytearrres
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tbytearrres
 $PPC -O2 -g forw
 $PPC -O2 -g tbyte
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tbyte
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tbyte
 rm -f uenum.ppu
 $PPC -O2 -g tenum
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tenum
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tenum
 $PPC -O2 -g tprop
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tprop
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tprop
 $PPC -O2 -g tprop2
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tprop2
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tprop2
 $PPC -O2 -g tclassproptest
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tclassproptest
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tclassproptest
 $PPC -O2 -g tset3 -dproc
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tset3
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tset3
 $PPC -O2 -g tset3
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tset3
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tset3
 $PPC -O2 -g taddset
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. taddset
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. taddset
 $PPC -O2 -g taddsetint
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. taddsetint
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. taddsetint
 $PPC -O2 -g tformalpara
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tformalpara
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tformalpara
 $PPC -O2 -g tvarpara
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tvarpara
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tvarpara
 $PPC -O2 -g tpvar
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tpvar
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tpvar
 $PPC -O2 -g tpvardelphi
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tpvardelphi
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tpvardelphi
 $PPC -O2 -g tpvarglobal
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tpvarglobal
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tpvarglobal
 $PPC -O2 -g tpvarglobaldelphi
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tpvarglobaldelphi
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tpvarglobaldelphi
 $PPC -O2 -g tvirtclmeth
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tvirtclmeth
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tvirtclmeth
 $PPC -O2 -g tdynarrec
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tdynarrec
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tdynarrec
 $PPC -O2 -g tconst
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tconst
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tconst
 $PPC -O2 -g twith
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. twith
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. twith
 $PPC -O2 -g tint
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tint
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tint
 $PPC -O2 -g ttrig
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. ttrig
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. ttrig
 $PPC -O2 -g ttrunc
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. ttrunc
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. ttrunc
 $PPC -O2 -g tset1
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tset1
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tset1
 $PPC -O2 -g tabs
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tabs
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tabs
 $PPC -O2 -g tintstr
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tintstr
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tintstr
 $PPC -O2 -g trange1
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. trange1
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. trange1
 $PPC -O2 -g trange2
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. trange2
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. trange2
 $PPC -O2 -g trange3
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. trange3
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. trange3
 $PPC -O2 -g tdefpara
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tdefpara
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tdefpara
 $PPC -O2 -g getbit
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. getbit
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. getbit
 $PPC -O2 -g tthreadvar
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tthreadvar
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tthreadvar
 $PPC -O2 -g tstring1
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tstring1
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tstring1
 $PPC -O2 -g tstrreal1
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tstrreal1
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tstrreal1
 $PPC -O2 -g tstrreal2
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tstrreal2
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tstrreal2
 $PPC -O2 -g -B tval
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tval
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tval
 $PPC -O2 -g -B tval5
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tval5
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tval5
 $PPC -O2 -g -B tstring9
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tstring9
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tstring9
 $PPC -O2 -g -B tstr
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tstr
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tstr
 $PPC -O2 -g -B tw20212 
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tw20212
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tw20212
 $PPC -O2 -g -B tdynarrnil
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tdynarrnil
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tdynarrnil
 $PPC -O2 -g -B tnestdynarr
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. tnestdynarr
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. tnestdynarr
 $PPC -O2 -g -B topovl
-java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/jvm-java:. topovl
+java -Dfile.encoding=UTF-8 -cp ../../../rtl/units/$RTLDIR:. topovl
diff --git a/tests/test/jvm/testintf.pp b/tests/test/jvm/testintf.pp
index 8e592b7e90..725b489c0b 100644
--- a/tests/test/jvm/testintf.pp
+++ b/tests/test/jvm/testintf.pp
@@ -41,7 +41,7 @@ type
 implementation
 
   uses
-    jdk15;
+    {$ifdef java}jdk15{$else}androidr14{$endif};
 
   constructor tintfclass.create;
     begin
diff --git a/tests/test/jvm/tformalpara.pp b/tests/test/jvm/tformalpara.pp
index 0b97e4be92..5d78e5c481 100644
--- a/tests/test/jvm/tformalpara.pp
+++ b/tests/test/jvm/tformalpara.pp
@@ -10,7 +10,7 @@ procedure main(args: array of string);
 implementation
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
   tc = class
diff --git a/tests/test/jvm/tint.pp b/tests/test/jvm/tint.pp
index 6963493274..fcf4c0578f 100644
--- a/tests/test/jvm/tint.pp
+++ b/tests/test/jvm/tint.pp
@@ -6,7 +6,7 @@ program tint;
 {$modeswitch exceptions}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$ifdef VER1_0}
   {$define SKIP_CURRENCY_TEST}
diff --git a/tests/test/jvm/tintstr.pp b/tests/test/jvm/tintstr.pp
index d48674b98b..88cff9a5b9 100644
--- a/tests/test/jvm/tintstr.pp
+++ b/tests/test/jvm/tintstr.pp
@@ -2,7 +2,7 @@ program tintstr;
 
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define writeln:=jlsystem.fout.println}
diff --git a/tests/test/jvm/tnestedset.pp b/tests/test/jvm/tnestedset.pp
index f5263e180b..dba7fc105f 100644
--- a/tests/test/jvm/tnestedset.pp
+++ b/tests/test/jvm/tnestedset.pp
@@ -3,7 +3,7 @@ program tnestedset;
 {$mode delphi}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
   tnestedfpstructenum = (ea,eb,ec);
diff --git a/tests/test/jvm/tnestproc.pp b/tests/test/jvm/tnestproc.pp
index bc2bdf7721..4a86aaf636 100644
--- a/tests/test/jvm/tnestproc.pp
+++ b/tests/test/jvm/tnestproc.pp
@@ -3,7 +3,7 @@ program tnestproc;
 {$mode delphi}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 procedure outer(var para: byte);
   const xxx: longint = 5;
diff --git a/tests/test/jvm/tprop.pp b/tests/test/jvm/tprop.pp
index de62e9c9ae..72abfa46e5 100644
--- a/tests/test/jvm/tprop.pp
+++ b/tests/test/jvm/tprop.pp
@@ -3,7 +3,7 @@ program tprop;
 {$mode delphi}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
   tc = class
diff --git a/tests/test/jvm/tprop2.pp b/tests/test/jvm/tprop2.pp
index a4516701ff..ec2ce3c95b 100644
--- a/tests/test/jvm/tprop2.pp
+++ b/tests/test/jvm/tprop2.pp
@@ -3,7 +3,7 @@ program tprop2;
 {$mode delphi}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
  tpropclass1 = class
diff --git a/tests/test/jvm/tpvar.pp b/tests/test/jvm/tpvar.pp
index 2d871744e6..ad0d6dfff1 100644
--- a/tests/test/jvm/tpvar.pp
+++ b/tests/test/jvm/tpvar.pp
@@ -3,7 +3,7 @@ program tpvar;
 {$mode objfpc}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
   tmprec = record
diff --git a/tests/test/jvm/tpvardelphi.pp b/tests/test/jvm/tpvardelphi.pp
index 27fe72069a..568a392a34 100644
--- a/tests/test/jvm/tpvardelphi.pp
+++ b/tests/test/jvm/tpvardelphi.pp
@@ -3,7 +3,7 @@ program tpvardelphi;
 {$mode delphi}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
   tmprec = record
diff --git a/tests/test/jvm/tpvarglobal.pp b/tests/test/jvm/tpvarglobal.pp
index 458ab61f5a..00f3f65f48 100644
--- a/tests/test/jvm/tpvarglobal.pp
+++ b/tests/test/jvm/tpvarglobal.pp
@@ -3,7 +3,7 @@ program tpvarglobal;
 {$mode objfpc}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
   tmprec = record
diff --git a/tests/test/jvm/tpvarglobaldelphi.pp b/tests/test/jvm/tpvarglobaldelphi.pp
index c757dbff66..a9ec5cf400 100644
--- a/tests/test/jvm/tpvarglobaldelphi.pp
+++ b/tests/test/jvm/tpvarglobaldelphi.pp
@@ -3,7 +3,7 @@ program tpvarglobaldelphi;
 {$mode delphi}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
   tmprec = record
diff --git a/tests/test/jvm/trange1.pp b/tests/test/jvm/trange1.pp
index be3f2e2194..ae6af15d39 100644
--- a/tests/test/jvm/trange1.pp
+++ b/tests/test/jvm/trange1.pp
@@ -8,7 +8,7 @@ program trange1;
 
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define writeln:=jlsystem.fout.println}
diff --git a/tests/test/jvm/trange2.pp b/tests/test/jvm/trange2.pp
index 9ad8282f4c..f3cd56cb16 100644
--- a/tests/test/jvm/trange2.pp
+++ b/tests/test/jvm/trange2.pp
@@ -3,7 +3,7 @@ program trange2;
 {$mode objfpc}
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define writeln:=jlsystem.fout.println}
diff --git a/tests/test/jvm/trange3.pp b/tests/test/jvm/trange3.pp
index 5f6ba15e78..c1a3657b0c 100644
--- a/tests/test/jvm/trange3.pp
+++ b/tests/test/jvm/trange3.pp
@@ -4,7 +4,7 @@ program trange3;
 
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define writeln:=jlsystem.fout.println}
diff --git a/tests/test/jvm/tset1.pp b/tests/test/jvm/tset1.pp
index 278912ccf8..e17a5c0f8c 100644
--- a/tests/test/jvm/tset1.pp
+++ b/tests/test/jvm/tset1.pp
@@ -9,7 +9,7 @@ program tset1;
 
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define writeln:=jlsystem.fout.println}
diff --git a/tests/test/jvm/tset3.pp b/tests/test/jvm/tset3.pp
index 36723428a6..8807212b16 100644
--- a/tests/test/jvm/tset3.pp
+++ b/tests/test/jvm/tset3.pp
@@ -3,7 +3,7 @@ program tset3;
 {$modeswitch exceptions}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define writeln:=JLSystem.fout.println}
diff --git a/tests/test/jvm/tstr.pp b/tests/test/jvm/tstr.pp
index 930cdbee64..419db9131a 100644
--- a/tests/test/jvm/tstr.pp
+++ b/tests/test/jvm/tstr.pp
@@ -1,7 +1,7 @@
 program tstr;
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define write:=JLSystem.fout.print}
diff --git a/tests/test/jvm/tstring1.pp b/tests/test/jvm/tstring1.pp
index 5b883ba917..78887ad7b4 100644
--- a/tests/test/jvm/tstring1.pp
+++ b/tests/test/jvm/tstring1.pp
@@ -2,7 +2,7 @@ program tstring1;
 
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define write:=JLSystem.fout.print}
diff --git a/tests/test/jvm/tstring9.pp b/tests/test/jvm/tstring9.pp
index fc7f659b1b..02238aa936 100644
--- a/tests/test/jvm/tstring9.pp
+++ b/tests/test/jvm/tstring9.pp
@@ -3,7 +3,7 @@ program tstring9
 {$ifdef fpc}{$mode objfpc}{$h+}{$endif}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define write:=JLSystem.fout.print}
diff --git a/tests/test/jvm/tstrreal1.pp b/tests/test/jvm/tstrreal1.pp
index dd89310ef2..d803e06d3d 100644
--- a/tests/test/jvm/tstrreal1.pp
+++ b/tests/test/jvm/tstrreal1.pp
@@ -2,7 +2,7 @@
 program tstrreal1;
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define write:=JLSystem.fout.print}
diff --git a/tests/test/jvm/tstrreal2.pp b/tests/test/jvm/tstrreal2.pp
index 350e2ddd4a..550ebfc72a 100644
--- a/tests/test/jvm/tstrreal2.pp
+++ b/tests/test/jvm/tstrreal2.pp
@@ -2,7 +2,7 @@ program tstrreal2;
 
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define write:=JLSystem.fout.print}
diff --git a/tests/test/jvm/tthreadvar.pp b/tests/test/jvm/tthreadvar.pp
index 5d79620166..dd90994ddc 100644
--- a/tests/test/jvm/tthreadvar.pp
+++ b/tests/test/jvm/tthreadvar.pp
@@ -4,7 +4,7 @@ program tthreadvar;
 {$modeswitch unicodestrings}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
   tc = class
diff --git a/tests/test/jvm/ttrig.pp b/tests/test/jvm/ttrig.pp
index ea54b94031..0f70ccdb2e 100644
--- a/tests/test/jvm/ttrig.pp
+++ b/tests/test/jvm/ttrig.pp
@@ -3,7 +3,7 @@ program ttrig;
 {$modeswitch exceptions}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define writeln:=JLSystem.fout.println}
diff --git a/tests/test/jvm/ttrunc.pp b/tests/test/jvm/ttrunc.pp
index 889dd610df..4d784bdc55 100644
--- a/tests/test/jvm/ttrunc.pp
+++ b/tests/test/jvm/ttrunc.pp
@@ -4,7 +4,7 @@ program ttrunc;
 {$modeswitch exceptions}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 
diff --git a/tests/test/jvm/tval.pp b/tests/test/jvm/tval.pp
index cceb0267d8..e0fc5f798b 100644
--- a/tests/test/jvm/tval.pp
+++ b/tests/test/jvm/tval.pp
@@ -10,7 +10,7 @@ program tval;
 
 uses
 {$ifdef cpujvm}
-  jdk15,
+  {$ifdef java}jdk15{$else}androidr14{$endif},
 {$endif}
   { longint type, short string }
   tval1,
diff --git a/tests/test/jvm/tval1.pp b/tests/test/jvm/tval1.pp
index fdf45cc85b..26c3cca324 100644
--- a/tests/test/jvm/tval1.pp
+++ b/tests/test/jvm/tval1.pp
@@ -7,7 +7,7 @@ interface
 
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define write:=JLSystem.fout.print}
diff --git a/tests/test/jvm/tval2.pp b/tests/test/jvm/tval2.pp
index 833c066a7d..a7b84f1fd0 100644
--- a/tests/test/jvm/tval2.pp
+++ b/tests/test/jvm/tval2.pp
@@ -7,7 +7,7 @@ interface
 
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define write:=JLSystem.fout.print}
diff --git a/tests/test/jvm/tval3.pp b/tests/test/jvm/tval3.pp
index d3cafe06ba..5bf9c2e19a 100644
--- a/tests/test/jvm/tval3.pp
+++ b/tests/test/jvm/tval3.pp
@@ -7,7 +7,7 @@ interface
 
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define write:=JLSystem.fout.print}
diff --git a/tests/test/jvm/tval4.pp b/tests/test/jvm/tval4.pp
index 57acf2c313..be1d593612 100644
--- a/tests/test/jvm/tval4.pp
+++ b/tests/test/jvm/tval4.pp
@@ -7,7 +7,7 @@ interface
 
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define write:=JLSystem.fout.print}
diff --git a/tests/test/jvm/tvalc.pp b/tests/test/jvm/tvalc.pp
index f69d778764..b29587e060 100644
--- a/tests/test/jvm/tvalc.pp
+++ b/tests/test/jvm/tvalc.pp
@@ -4,7 +4,7 @@ interface
 
 {$ifdef cpujvm}
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define write:=JLSystem.fout.print}
diff --git a/tests/test/jvm/tvarpara.pp b/tests/test/jvm/tvarpara.pp
index e3947cebe5..7e93195737 100644
--- a/tests/test/jvm/tvarpara.pp
+++ b/tests/test/jvm/tvarpara.pp
@@ -3,7 +3,7 @@ program tvarpara;
 {$mode objfpc}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 procedure test(var c: char);
 begin
diff --git a/tests/test/jvm/tvirtclmeth.pp b/tests/test/jvm/tvirtclmeth.pp
index eb936ab2ea..a06cdb9284 100644
--- a/tests/test/jvm/tvirtclmeth.pp
+++ b/tests/test/jvm/tvirtclmeth.pp
@@ -3,7 +3,7 @@ program tvirtclmeth;
 {$mode delphi}
 
 uses
-  jdk15;
+  {$ifdef java}jdk15{$else}androidr14{$endif};
 
 type
   tvirtclmethbase = class
diff --git a/tests/test/jvm/tw20212.pp b/tests/test/jvm/tw20212.pp
index 1fa67ca924..bc62e7984b 100644
--- a/tests/test/jvm/tw20212.pp
+++ b/tests/test/jvm/tw20212.pp
@@ -4,7 +4,7 @@ program tw20212;
 
 {$ifdef cpujvm}
 uses
- jdk15;
+ {$ifdef java}jdk15{$else}androidr14{$endif};
 
 {$macro on}
 {$define writeln:=JLSystem.fout.println}