diff --git a/i18npool/CppunitTest_i18npool_breakiterator.mk b/i18npool/CppunitTest_i18npool_breakiterator.mk
new file mode 100644
index 000000000000..656d9aa75ccd
--- /dev/null
+++ b/i18npool/CppunitTest_i18npool_breakiterator.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,i18npool_break_iterator))
+
+$(eval $(call gb_CppunitTest_use_external,i18npool_break_iterator,icu_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_break_iterator))
+
+$(eval $(call gb_CppunitTest_use_libraries,i18npool_break_iterator,\
+	cppu \
+	cppuhelper \
+	sal \
+	unotest \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,i18npool_break_iterator,\
+    i18npool/qa/cppunit/test_breakiterator \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,i18npool_break_iterator))
+
+$(eval $(call gb_CppunitTest_use_components,i18npool_break_iterator,\
+	i18npool/util/i18npool \
+))
+
+$(call gb_CppunitTest_get_target,i18npool_break_iterator) : \
+    $(call gb_Library_get_target,dict_ja) \
+    $(call gb_Library_get_target,dict_zh)
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18npool/CppunitTest_i18npool_test_calendar.mk b/i18npool/CppunitTest_i18npool_calendar.mk
similarity index 52%
rename from i18npool/CppunitTest_i18npool_test_calendar.mk
rename to i18npool/CppunitTest_i18npool_calendar.mk
index 85a3b2fbb576..701dfec27db6 100644
--- a/i18npool/CppunitTest_i18npool_test_calendar.mk
+++ b/i18npool/CppunitTest_i18npool_calendar.mk
@@ -7,16 +7,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_calendar))
+$(eval $(call gb_CppunitTest_CppunitTest,i18npool_calendar))
 
-$(eval $(call gb_CppunitTest_set_include,i18npool_test_calendar,\
+$(eval $(call gb_CppunitTest_set_include,i18npool_calendar,\
     $$(INCLUDE) \
     -I$(SRCDIR)/i18npool/inc \
 ))
 
-$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_test_calendar))
+$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_calendar))
 
-$(eval $(call gb_CppunitTest_use_libraries,i18npool_test_calendar,\
+$(eval $(call gb_CppunitTest_use_libraries,i18npool_calendar,\
 	cppu \
 	cppuhelper \
 	sal \
@@ -24,19 +24,19 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_calendar,\
     i18npool \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,i18npool_test_calendar,\
+$(eval $(call gb_CppunitTest_use_externals,i18npool_calendar,\
     icui18n \
     icuuc \
     icu_headers \
 ))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_calendar,\
+$(eval $(call gb_CppunitTest_add_exception_objects,i18npool_calendar,\
     i18npool/qa/cppunit/test_calendar \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,i18npool_test_calendar))
+$(eval $(call gb_CppunitTest_use_ure,i18npool_calendar))
 
-$(eval $(call gb_CppunitTest_use_components,i18npool_test_calendar,\
+$(eval $(call gb_CppunitTest_use_components,i18npool_calendar,\
 	i18npool/util/i18npool \
 ))
 
diff --git a/i18npool/CppunitTest_i18npool_characterclassification.mk b/i18npool/CppunitTest_i18npool_characterclassification.mk
new file mode 100644
index 000000000000..5c94ac9065ff
--- /dev/null
+++ b/i18npool/CppunitTest_i18npool_characterclassification.mk
@@ -0,0 +1,31 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,i18npool_characterclassification))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_characterclassification))
+
+$(eval $(call gb_CppunitTest_use_libraries,i18npool_characterclassification,\
+	cppu \
+	cppuhelper \
+	sal \
+	unotest \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,i18npool_characterclassification,\
+    i18npool/qa/cppunit/test_characterclassification \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,i18npool_characterclassification))
+
+$(eval $(call gb_CppunitTest_use_components,i18npool_characterclassification,\
+	i18npool/util/i18npool \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk b/i18npool/CppunitTest_i18npool_ordinalsuffix.mk
similarity index 51%
rename from i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk
rename to i18npool/CppunitTest_i18npool_ordinalsuffix.mk
index a69e703c9c33..6f48512e5331 100644
--- a/i18npool/CppunitTest_i18npool_test_ordinalsuffix.mk
+++ b/i18npool/CppunitTest_i18npool_ordinalsuffix.mk
@@ -7,24 +7,24 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_ordinalsuffix))
+$(eval $(call gb_CppunitTest_CppunitTest,i18npool_ordinalsuffix))
 
-$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_test_ordinalsuffix))
+$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_ordinalsuffix))
 
-$(eval $(call gb_CppunitTest_use_libraries,i18npool_test_ordinalsuffix,\
+$(eval $(call gb_CppunitTest_use_libraries,i18npool_ordinalsuffix,\
 	cppu \
 	cppuhelper \
 	sal \
 	unotest \
 ))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_ordinalsuffix,\
+$(eval $(call gb_CppunitTest_add_exception_objects,i18npool_ordinalsuffix,\
     i18npool/qa/cppunit/test_ordinalsuffix \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,i18npool_test_ordinalsuffix))
+$(eval $(call gb_CppunitTest_use_ure,i18npool_ordinalsuffix))
 
-$(eval $(call gb_CppunitTest_use_components,i18npool_test_ordinalsuffix,\
+$(eval $(call gb_CppunitTest_use_components,i18npool_ordinalsuffix,\
 	i18npool/util/i18npool \
 ))
 
diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
deleted file mode 100644
index 4aa538114a33..000000000000
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_breakiterator))
-
-$(eval $(call gb_CppunitTest_use_external,i18npool_test_breakiterator,icu_headers))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_test_breakiterator))
-
-$(eval $(call gb_CppunitTest_use_libraries,i18npool_test_breakiterator,\
-	cppu \
-	cppuhelper \
-	sal \
-	unotest \
-))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_breakiterator,\
-    i18npool/qa/cppunit/test_breakiterator \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,i18npool_test_breakiterator))
-
-$(eval $(call gb_CppunitTest_use_components,i18npool_test_breakiterator,\
-	i18npool/util/i18npool \
-))
-
-$(call gb_CppunitTest_get_target,i18npool_test_breakiterator) : \
-    $(call gb_Library_get_target,dict_ja) \
-    $(call gb_Library_get_target,dict_zh)
-
-# vim: set noet sw=4 ts=4:
diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk b/i18npool/CppunitTest_i18npool_test_characterclassification.mk
deleted file mode 100644
index e9999b89966d..000000000000
--- a/i18npool/CppunitTest_i18npool_test_characterclassification.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_characterclassification))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_test_characterclassification))
-
-$(eval $(call gb_CppunitTest_use_libraries,i18npool_test_characterclassification,\
-	cppu \
-	cppuhelper \
-	sal \
-	unotest \
-))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_characterclassification,\
-    i18npool/qa/cppunit/test_characterclassification \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,i18npool_test_characterclassification))
-
-$(eval $(call gb_CppunitTest_use_components,i18npool_test_characterclassification,\
-	i18npool/util/i18npool \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/i18npool/CppunitTest_i18npool_test_textsearch.mk b/i18npool/CppunitTest_i18npool_textsearch.mk
similarity index 52%
rename from i18npool/CppunitTest_i18npool_test_textsearch.mk
rename to i18npool/CppunitTest_i18npool_textsearch.mk
index f48c93227f2b..e556abda2b89 100644
--- a/i18npool/CppunitTest_i18npool_test_textsearch.mk
+++ b/i18npool/CppunitTest_i18npool_textsearch.mk
@@ -7,28 +7,28 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,i18npool_test_textsearch))
+$(eval $(call gb_CppunitTest_CppunitTest,i18npool_textsearch))
 
-$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_test_textsearch))
+$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_textsearch))
 
-$(eval $(call gb_CppunitTest_use_ure,i18npool_test_textsearch))
+$(eval $(call gb_CppunitTest_use_ure,i18npool_textsearch))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,i18npool_test_textsearch,\
+$(eval $(call gb_CppunitTest_add_exception_objects,i18npool_textsearch,\
 	i18npool/qa/cppunit/test_textsearch \
 ))
 
-$(eval $(call gb_CppunitTest_use_components,i18npool_test_textsearch,\
+$(eval $(call gb_CppunitTest_use_components,i18npool_textsearch,\
 	i18npool/source/search/i18nsearch \
 	i18npool/util/i18npool \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,i18npool_test_textsearch,\
+$(eval $(call gb_CppunitTest_use_externals,i18npool_textsearch,\
 	icui18n \
 	icuuc \
 	icu_headers \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,i18npool_test_textsearch,\
+$(eval $(call gb_CppunitTest_use_libraries,i18npool_textsearch,\
 	cppu \
 	cppuhelper \
 	sal \
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index 1926fdd70d82..e66a08a648ab 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -39,11 +39,11 @@ $(eval $(call gb_Module_add_targets_for_build,i18npool,\
 ))
 
 $(eval $(call gb_Module_add_check_targets,i18npool,\
-	CppunitTest_i18npool_test_breakiterator \
-	CppunitTest_i18npool_test_characterclassification \
-	CppunitTest_i18npool_test_ordinalsuffix \
-	CppunitTest_i18npool_test_textsearch \
-	CppunitTest_i18npool_test_calendar \
+	CppunitTest_i18npool_breakiterator \
+	CppunitTest_i18npool_characterclassification \
+	CppunitTest_i18npool_ordinalsuffix \
+	CppunitTest_i18npool_textsearch \
+	CppunitTest_i18npool_calendar \
 	CppunitTest_i18npool_defaultnumberingprovider \
 ))