diff --git a/bean/JunitTest_bean_complex.mk b/bean/JunitTest_bean_complex.mk
index 837b99968ce853e76021bdce718dab96213751d8..f443d39fe1a4c9d7f67a55ac0ab94d6a3fd99d96 100644
--- a/bean/JunitTest_bean_complex.mk
+++ b/bean/JunitTest_bean_complex.mk
@@ -27,7 +27,7 @@
 # instead of those above.
 #
 
-$(eval $(call gb_JunitTest_JunitTest,bean_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,bean_complex))
 
 $(eval $(call gb_JunitTest_add_jars,bean_complex,\
 	$(OUTDIR)/bin/OOoRunner.jar \
diff --git a/chart2/JunitTest_chart2_unoapi.mk b/chart2/JunitTest_chart2_unoapi.mk
index 989502478f23d697b0d9b145f2e115c471ba3cd6..ad0315aaed813a3dcdb102608104866cefdcef02 100644
--- a/chart2/JunitTest_chart2_unoapi.mk
+++ b/chart2/JunitTest_chart2_unoapi.mk
@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,chart2_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,chart2_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,chart2_unoapi,\
     $$(DEFS) \
diff --git a/comphelper/JunitTest_comphelper_complex.mk b/comphelper/JunitTest_comphelper_complex.mk
index adf616b220d08072636a56890ac6d81e2846acfb..090ed605a3e241e6e136ac03da0f08f618dbff96 100644
--- a/comphelper/JunitTest_comphelper_complex.mk
+++ b/comphelper/JunitTest_comphelper_complex.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,comphelper_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,comphelper_complex))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\
     comphelper/qa/complex/comphelper/Map \
diff --git a/configmgr/JunitTest_configmgr_unoapi.mk b/configmgr/JunitTest_configmgr_unoapi.mk
index 3f1537fd8cc291acd0f229597ab602052d7db1a4..e1abbb331cabd0075dda35936183825875e24d01 100644
--- a/configmgr/JunitTest_configmgr_unoapi.mk
+++ b/configmgr/JunitTest_configmgr_unoapi.mk
@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,configmgr_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,configmgr_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,configmgr_unoapi,\
     $$(DEFS) \
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk
index 0479955e2e8a59e26f3c1b43cb7535589147a329..8606bfe4b03fceff178594255015882c6780692c 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,dbaccess_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,dbaccess_complex))
 
 $(eval $(call gb_JunitTest_set_defs,dbaccess_complex,\
 	$$(DEFS) \
diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk
index 9b9331381da34dc9c16dba98449820f833e1a683..d999518481259ee23d6724fbb7e1f01879124ce3 100644
--- a/dbaccess/JunitTest_dbaccess_unoapi.mk
+++ b/dbaccess/JunitTest_dbaccess_unoapi.mk
@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,dbaccess_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,dbaccess_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,dbaccess_unoapi,\
     $$(DEFS) \
diff --git a/filter/JunitTest_filter_complex.mk b/filter/JunitTest_filter_complex.mk
index 8e891d0e833fa98aa76dd86299fc1804cca6e359..0902b99adce9de7862b7d88999a09f1469186222 100644
--- a/filter/JunitTest_filter_complex.mk
+++ b/filter/JunitTest_filter_complex.mk
@@ -17,7 +17,7 @@
 # under the License.
 #***************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,filter_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,filter_complex))
 
 $(eval $(call gb_JunitTest_add_jars,filter_complex,\
 	$(OUTDIR)/bin/OOoRunner.jar \
diff --git a/forms/JunitTest_forms_complex.mk b/forms/JunitTest_forms_complex.mk
index 62c83f4fddab5253d119b7a9a4717d40975307f9..c61af34e757198afc68ff59d4f78a55bf3ef0d27 100644
--- a/forms/JunitTest_forms_complex.mk
+++ b/forms/JunitTest_forms_complex.mk
@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,forms_complex, SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,forms_complex))
 
 $(eval $(call gb_JunitTest_add_jars,forms_complex,\
     $(OUTDIR)/bin/OOoRunner.jar \
diff --git a/forms/JunitTest_forms_unoapi.mk b/forms/JunitTest_forms_unoapi.mk
index 97bd610e586303767c3a3af5c9443e042a429694..b23f2f645b7d9244f71a7b4e9446b9a0ca56ac32 100644
--- a/forms/JunitTest_forms_unoapi.mk
+++ b/forms/JunitTest_forms_unoapi.mk
@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,forms_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,forms_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,forms_unoapi,\
     $$(DEFS) \
diff --git a/framework/JunitTest_framework_complex.mk b/framework/JunitTest_framework_complex.mk
index e91e9d1e657d34c6e28a1cec298b8c2c94fa5c59..2283cb1208b14de0518bc88a362910bedae4b79b 100644
--- a/framework/JunitTest_framework_complex.mk
+++ b/framework/JunitTest_framework_complex.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,framework_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,framework_complex))
 
 $(eval $(call gb_JunitTest_set_defs,framework_complex,\
     $$(DEFS) \
diff --git a/framework/JunitTest_framework_unoapi.mk b/framework/JunitTest_framework_unoapi.mk
index 5321ad4e434ac36730979ac427f007fcf8d1764a..d9d2177655b64de154451f9d1c8c9f468961e496 100644
--- a/framework/JunitTest_framework_unoapi.mk
+++ b/framework/JunitTest_framework_unoapi.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,framework_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,framework_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,framework_unoapi,\
     $$(DEFS) \
diff --git a/linguistic/JunitTest_linguistic_complex.mk b/linguistic/JunitTest_linguistic_complex.mk
index ffd3e0b13378d980acfdb146a696ff5f330c49e7..2e761e98676139704053de2a51bb53e5c8e511b8 100644
--- a/linguistic/JunitTest_linguistic_complex.mk
+++ b/linguistic/JunitTest_linguistic_complex.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,linguistic_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,linguistic_complex))
 
 $(eval $(call gb_JunitTest_set_defs,linguistic_complex,\
 	$$(DEFS) \
diff --git a/linguistic/JunitTest_linguistic_unoapi.mk b/linguistic/JunitTest_linguistic_unoapi.mk
index e67a855050e13f9668a8c20ea88e9a7369c7cb08..1880272cdcbd47c1b9ff699a720bdbace8b5e87c 100644
--- a/linguistic/JunitTest_linguistic_unoapi.mk
+++ b/linguistic/JunitTest_linguistic_unoapi.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,linguistic_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,linguistic_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,linguistic_unoapi,\
 	$$(DEFS) \
diff --git a/qadevOOo/JunitTest_qadevOOo_unoapi.mk b/qadevOOo/JunitTest_qadevOOo_unoapi.mk
index 78da759cbf424dfc0fc21a7028b151defceef849..e048c6e5ad3b4d441998aed9fb10d0f8b540522e 100644
--- a/qadevOOo/JunitTest_qadevOOo_unoapi.mk
+++ b/qadevOOo/JunitTest_qadevOOo_unoapi.mk
@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,qadevOOo_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,qadevOOo_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,qadevOOo_unoapi,\
     $$(DEFS) \
diff --git a/reportdesign/JunitTest_reportdesign_complex.mk b/reportdesign/JunitTest_reportdesign_complex.mk
index 1fcf77fa5dc502be7d87d13ea4d33f90c939fa65..8d3bba6a0cd531a23dcb2f9f26b226cfe2c54ced 100644
--- a/reportdesign/JunitTest_reportdesign_complex.mk
+++ b/reportdesign/JunitTest_reportdesign_complex.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,reportdesign_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,reportdesign_complex))
 
 $(eval $(call gb_JunitTest_set_defs,reportdesign_complex,\
 	$$(DEFS) \
diff --git a/sc/JunitTest_sc_complex.mk b/sc/JunitTest_sc_complex.mk
index 80e193078da00782d3ae73fdb667333abf31aa86..a54dee489fd9ed478a627d208e83461525cc2c06 100644
--- a/sc/JunitTest_sc_complex.mk
+++ b/sc/JunitTest_sc_complex.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,sc_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,sc_complex))
 
 # sc/qa/complex/calcPreview/ tests do not work autmatically (they request "Press
 # any key after resizing" etc.)
diff --git a/sc/JunitTest_sc_unoapi.mk b/sc/JunitTest_sc_unoapi.mk
index fb2efdd08e8ec804a328923c0f6197cf7f68e90a..699daf4fa1fe9c5b2840c94c5bb2ae9dae59fa88 100644
--- a/sc/JunitTest_sc_unoapi.mk
+++ b/sc/JunitTest_sc_unoapi.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,sc_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,sc_unoapi))
 
 $(eval $(call gb_JunitTest_add_classes,sc_unoapi, \
     org.openoffice.test.UnoApiTest \
diff --git a/sd/JunitTest_sd_unoapi.mk b/sd/JunitTest_sd_unoapi.mk
index 17fcb8920d8e1aeeb708166ca2f70ae97573d345..5d641259b58e5ad80ac3940e7d1380ba4085ceeb 100644
--- a/sd/JunitTest_sd_unoapi.mk
+++ b/sd/JunitTest_sd_unoapi.mk
@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,sd_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,sd_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,sd_unoapi,\
     $$(DEFS) \
diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk
index e287265a814cf58ca8879067071d41f6927ac640..972f5aab80d98743829f2c7ad3230ae68902b8bf 100644
--- a/sfx2/JunitTest_sfx2_complex.mk
+++ b/sfx2/JunitTest_sfx2_complex.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,sfx2_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,sfx2_complex))
 
 $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\
     $$(DEFS) \
diff --git a/sfx2/JunitTest_sfx2_unoapi.mk b/sfx2/JunitTest_sfx2_unoapi.mk
index 4f15dc51988ae86d294ffd5df1c5b17e7bf41e0c..cd5bec92f110e961680a4334fff1fcc824ce6a7d 100644
--- a/sfx2/JunitTest_sfx2_unoapi.mk
+++ b/sfx2/JunitTest_sfx2_unoapi.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,sfx2_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,sfx2_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,sfx2_unoapi,\
     $$(DEFS) \
diff --git a/sot/JunitTest_sot_complex.mk b/sot/JunitTest_sot_complex.mk
index a6d83143d335678598bf2cc36c8c55ab4449c4a1..a1a6d359d6551596c4f16027ce9c6f0e88596c21 100644
--- a/sot/JunitTest_sot_complex.mk
+++ b/sot/JunitTest_sot_complex.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,sot_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,sot_complex))
 
 $(eval $(call gb_JunitTest_add_sourcefiles,sot_complex,\
     sot/qa/complex/olesimplestorage/OLESimpleStorageTest \
diff --git a/starmath/JunitTest_sm_unoapi.mk b/starmath/JunitTest_sm_unoapi.mk
index 129a5236e99897172dc8ebb5d07a2a6954188411..c70699f44a8fbb536933abbb47b24eec6a22bdc8 100644
--- a/starmath/JunitTest_sm_unoapi.mk
+++ b/starmath/JunitTest_sm_unoapi.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,sm_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,sm_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,sm_unoapi,\
 	$$(DEFS) \
diff --git a/svl/JunitTest_svl_complex.mk b/svl/JunitTest_svl_complex.mk
index ae6260a0049460eb930b7e5550dbeb7967c0d648..257e4e4d0ebb8d64c102f17f34fc436e2a1de35d 100644
--- a/svl/JunitTest_svl_complex.mk
+++ b/svl/JunitTest_svl_complex.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,svl_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,svl_complex))
 
 $(eval $(call gb_JunitTest_set_defs,svl_complex,\
     $$(DEFS) \
diff --git a/svtools/JunitTest_svtools_unoapi.mk b/svtools/JunitTest_svtools_unoapi.mk
index 4716809bd31c99138a94c67facbcfbff74e4163b..386b06f9d885ddca7a850c8899c2ac55c8233de8 100644
--- a/svtools/JunitTest_svtools_unoapi.mk
+++ b/svtools/JunitTest_svtools_unoapi.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,svtools_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,svtools_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,svtools_unoapi,\
     $$(DEFS) \
diff --git a/svx/JunitTest_svx_unoapi.mk b/svx/JunitTest_svx_unoapi.mk
index 53cc49381bf3c3dc51a61b3710142caf6b63e234..5fa78c0a0d6847a40d3435a231623869b60df49d 100644
--- a/svx/JunitTest_svx_unoapi.mk
+++ b/svx/JunitTest_svx_unoapi.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,svx_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,svx_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,svx_unoapi,\
     $$(DEFS) \
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 4ed426dfc82550e0d980e7500bbeca35a38d19c3..28d3282225a0e8e64cb25343ff28bb9b63664bbd 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,sw_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,sw_complex))
 
 $(eval $(call gb_JunitTest_set_defs,sw_complex,\
     $$(DEFS) \
diff --git a/sw/JunitTest_sw_unoapi.mk b/sw/JunitTest_sw_unoapi.mk
index 1e64feb93469b7c54c62484c84f097bb6487fd4b..157dd703ab7df68a0b066f9db8d051cb18ee2af2 100644
--- a/sw/JunitTest_sw_unoapi.mk
+++ b/sw/JunitTest_sw_unoapi.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,sw_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,sw_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,sw_unoapi,\
     $$(DEFS) \
diff --git a/toolkit/JunitTest_toolkit_unoapi.mk b/toolkit/JunitTest_toolkit_unoapi.mk
index 01cebea65cfe77184ba943fc2b44c915845e63d2..94d2e0d5cb10f0dbdf21a0aa9701742a6c679303 100644
--- a/toolkit/JunitTest_toolkit_unoapi.mk
+++ b/toolkit/JunitTest_toolkit_unoapi.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,toolkit_unoapi,\
     $$(DEFS) \
diff --git a/ucb/JunitTest_ucb_complex.mk b/ucb/JunitTest_ucb_complex.mk
index bd013ee2c3ab9b534099e14c7a3772d4263f9cad..625f10a5af5ad9d3c029380d1eae94407e64c113 100644
--- a/ucb/JunitTest_ucb_complex.mk
+++ b/ucb/JunitTest_ucb_complex.mk
@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,ucb_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,ucb_complex))
 
 $(eval $(call gb_JunitTest_set_defs,ucb_complex,\
     $$(DEFS) \
diff --git a/ucb/JunitTest_ucb_unoapi.mk b/ucb/JunitTest_ucb_unoapi.mk
index 9d00396a27202f0fd6c6e89b596d3abcd97ea5f3..de862158a874aea19df65dc86547b5e219864288 100644
--- a/ucb/JunitTest_ucb_unoapi.mk
+++ b/ucb/JunitTest_ucb_unoapi.mk
@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,ucb_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,ucb_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,ucb_unoapi,\
     $$(DEFS) \
diff --git a/unotools/JunitTest_unotools_complex.mk b/unotools/JunitTest_unotools_complex.mk
index 4469a21f3ae42af68dbd5a0a05ad3481a52bbace..43a41d711e50fb8a476baca49c1134d4d36b85ee 100644
--- a/unotools/JunitTest_unotools_complex.mk
+++ b/unotools/JunitTest_unotools_complex.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,unotools_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,unotools_complex))
 
 $(eval $(call gb_JunitTest_set_defs,unotools_complex,\
 	$$(DEFS) \
diff --git a/unoxml/JunitTest_unordf_complex.mk b/unoxml/JunitTest_unordf_complex.mk
index ce897704edd273016f3cc0028ce23cde91697897..bd0c12fa2e41187019821cb9874c1b3c2baa3322 100644
--- a/unoxml/JunitTest_unordf_complex.mk
+++ b/unoxml/JunitTest_unordf_complex.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,unordf_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,unordf_complex))
 
 $(eval $(call gb_JunitTest_set_defs,unordf_complex,\
     $$(DEFS) \
diff --git a/unoxml/JunitTest_unoxml_complex.mk b/unoxml/JunitTest_unoxml_complex.mk
index beeb2f72849011683d27387178c4319da43277f3..5a5cd4ffa8e01d979aa992e64ba96c74055e7efc 100644
--- a/unoxml/JunitTest_unoxml_complex.mk
+++ b/unoxml/JunitTest_unoxml_complex.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,unoxml_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,unoxml_complex))
 
 $(eval $(call gb_JunitTest_set_defs,unoxml_complex,\
     $$(DEFS) \
diff --git a/writerfilter/JunitTest_writerfilter_complex.mk b/writerfilter/JunitTest_writerfilter_complex.mk
index cf238a25e8a046b8401a01c0def0e50a58196f7b..d9d1a5cf727ba6b5cf75ac20ce383f4eca103f43 100644
--- a/writerfilter/JunitTest_writerfilter_complex.mk
+++ b/writerfilter/JunitTest_writerfilter_complex.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex))
 
 $(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\
 	$$(DEFS) \
diff --git a/xmloff/JunitTest_xmloff_unoapi.mk b/xmloff/JunitTest_xmloff_unoapi.mk
index cc57b329c6b4fdfa5b4b89835abcc563a882c44a..11ad772105206ab91412d4a4dc194a7c07c8e83c 100644
--- a/xmloff/JunitTest_xmloff_unoapi.mk
+++ b/xmloff/JunitTest_xmloff_unoapi.mk
@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,xmloff_unoapi,SRCDIR))
+$(eval $(call gb_JunitTest_JunitTest,xmloff_unoapi))
 
 $(eval $(call gb_JunitTest_set_defs,xmloff_unoapi,\
     $$(DEFS) \