diff --git a/sd/CppunitTest_sd_import_tests-smartart.mk b/sd/CppunitTest_sd_import_tests-smartart.mk
new file mode 100644
index 000000000000..9b7362b08152
--- /dev/null
+++ b/sd/CppunitTest_sd_import_tests-smartart.mk
@@ -0,0 +1,14 @@
+# -*- 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 sd_import_test,-smartart))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk
index 1568b4653493..c75b571c2f4e 100644
--- a/sd/CppunitTest_sd_import_tests.mk
+++ b/sd/CppunitTest_sd_import_tests.mk
@@ -9,128 +9,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sd_import_tests))
-
-$(eval $(call gb_CppunitTest_use_externals,sd_import_tests,\
-	boost_headers \
-	libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sd_import_tests))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sd_import_tests, \
-    sd/qa/unit/import-tests \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sd_import_tests, \
-	$(call gb_Helper_optional,AVMEDIA,avmedia) \
-    basegfx \
-    comphelper \
-    cppu \
-    cppuhelper \
-    drawinglayer \
-    editeng \
-    for \
-    forui \
-    i18nlangtag \
-    msfilter \
-    oox \
-    sal \
-    salhelper \
-    sax \
-    sd \
-    sfx \
-    sot \
-    svl \
-    svt \
-    svx \
-    svxcore \
-    test \
-    tl \
-    tk \
-    ucbhelper \
-    unotest \
-    utl \
-    vcl \
-    xo \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sd_import_tests,\
-    -I$(SRCDIR)/sd/source/ui/inc \
-    -I$(SRCDIR)/sd/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sd_import_tests))
-
-$(eval $(call gb_CppunitTest_use_ure,sd_import_tests))
-$(eval $(call gb_CppunitTest_use_vcl,sd_import_tests))
-
-$(eval $(call gb_CppunitTest_use_components,sd_import_tests,\
-    animations/source/animcore/animcore \
-    basic/util/sb \
-    chart2/source/chartcore \
-    chart2/source/controller/chartcontroller \
-    comphelper/util/comphelp \
-    configmgr/source/configmgr \
-    dbaccess/util/dba \
-    desktop/source/deployment/deployment \
-    drawinglayer/drawinglayer \
-    embeddedobj/util/embobj \
-    emfio/emfio \
-    filter/source/config/cache/filterconfig1 \
-	filter/source/odfflatxml/odfflatxml \
-    filter/source/svg/svgfilter \
-    filter/source/pdf/pdffilter \
-    filter/source/xmlfilteradaptor/xmlfa \
-	filter/source/xmlfilterdetect/xmlfd \
-	filter/source/storagefilterdetect/storagefd \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    linguistic/source/lng \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    sd/util/sd \
-    sd/util/sdfilt \
-    sd/util/sdd \
-    $(if $(ENABLE_POPPLER),sdext/source/pdfimport/pdfimport) \
-    sfx2/util/sfx \
-    sot/util/sot \
-    svl/source/fsstor/fsstorage \
-    svtools/util/svt \
-    svx/util/svxcore \
-    svgio/svgio \
-    toolkit/util/tk \
-    ucb/source/core/ucb1 \
-    ucb/source/ucp/expand/ucpexpand1 \
-    ucb/source/ucp/file/ucpfile1 \
-    ucb/source/ucp/package/ucppkg1 \
-    ucb/source/ucp/tdoc/ucptdoc1 \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-    uui/util/uui \
-    vcl/vcl.common \
-    xmlscript/util/xmlscript \
-    xmloff/util/xo \
-    xmlsecurity/util/xmlsecurity \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sd_import_tests))
-
-$(eval $(call gb_CppunitTest_use_packages,sd_import_tests,\
-	oox_customshapes \
-))
-
-ifneq ($(ENABLE_POPPLER),)
-$(eval $(call gb_CppunitTest_use_executable,sd_import_tests,xpdfimport))
-endif
-
-$(eval $(call gb_CppunitTest_add_arguments,sd_import_tests, \
-    -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
-))
+# empty second argument (i.e. no 1)
+$(eval $(call sd_import_test,))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sd/CppunitTest_sd_import_tests_smartart.mk b/sd/CppunitTest_sd_import_tests_smartart.mk
deleted file mode 100644
index 208f433fe9a6..000000000000
--- a/sd/CppunitTest_sd_import_tests_smartart.mk
+++ /dev/null
@@ -1,81 +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,sd_import_tests_smartart))
-
-$(eval $(call gb_CppunitTest_use_externals,sd_import_tests_smartart,\
-	boost_headers \
-	libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sd_import_tests_smartart))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sd_import_tests_smartart, \
-    sd/qa/unit/import-tests-smartart \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sd_import_tests_smartart, \
-	$(call gb_Helper_optional,AVMEDIA,avmedia) \
-    basegfx \
-    comphelper \
-    cppu \
-    cppuhelper \
-    drawinglayer \
-    editeng \
-    for \
-    forui \
-    i18nlangtag \
-    msfilter \
-    oox \
-    sal \
-    salhelper \
-    sax \
-    sd \
-    sfx \
-    sot \
-    svl \
-    svt \
-    svx \
-    svxcore \
-    test \
-    tl \
-    tk \
-    ucbhelper \
-    unotest \
-    utl \
-    vcl \
-    xo \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sd_import_tests_smartart,\
-    -I$(SRCDIR)/sd/source/ui/inc \
-    -I$(SRCDIR)/sd/inc \
-    $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sd_import_tests_smartart))
-
-$(eval $(call gb_CppunitTest_use_ure,sd_import_tests_smartart))
-$(eval $(call gb_CppunitTest_use_vcl,sd_import_tests_smartart))
-
-$(eval $(call gb_CppunitTest_use_rdb,sd_import_tests_smartart,services))
-
-$(eval $(call gb_CppunitTest_use_configuration,sd_import_tests_smartart))
-
-$(eval $(call gb_CppunitTest_use_packages,sd_import_tests_smartart,\
-	oox_customshapes \
-))
-
-$(eval $(call gb_CppunitTest_add_arguments,sd_import_tests_smartart, \
-    -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 3fa1debe3958..6099561ce312 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -8,6 +8,7 @@
 #
 
 include $(SRCDIR)/sd/export_setup.mk
+include $(SRCDIR)/sd/import_setup.mk
 
 $(eval $(call gb_Module_Module,sd))
 
@@ -32,7 +33,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sd,\
 	$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
 		CppunitTest_sd_uimpress) \
     CppunitTest_sd_import_tests \
-    CppunitTest_sd_import_tests_smartart \
+    CppunitTest_sd_import_tests-smartart \
     CppunitTest_sd_export_tests-ooxml1 \
     CppunitTest_sd_export_tests-ooxml2 \
     CppunitTest_sd_export_tests-ooxml3 \
diff --git a/sd/import_setup.mk b/sd/import_setup.mk
new file mode 100644
index 000000000000..0fd0984aca2c
--- /dev/null
+++ b/sd/import_setup.mk
@@ -0,0 +1,141 @@
+# -*- 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/.
+#
+#*************************************************************************
+
+# template for import tests
+define sd_import_test
+
+$(eval $(call gb_CppunitTest_CppunitTest,sd_import_tests$(1)))
+
+$(eval $(call gb_CppunitTest_use_externals,sd_import_tests$(1),\
+	boost_headers \
+	libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sd_import_tests$(1)))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sd_import_tests$(1), \
+    sd/qa/unit/import-tests$(1) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sd_import_tests$(1), \
+	$(call gb_Helper_optional,AVMEDIA,avmedia) \
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    drawinglayer \
+    editeng \
+    for \
+    forui \
+    i18nlangtag \
+    msfilter \
+    oox \
+    sal \
+    salhelper \
+    sax \
+    sd \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svx \
+    svxcore \
+    test \
+    tl \
+    tk \
+    ucbhelper \
+    unotest \
+    utl \
+    vcl \
+    xo \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sd_import_tests$(1),\
+    -I$(SRCDIR)/sd/source/ui/inc \
+    -I$(SRCDIR)/sd/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_import_tests$(1)))
+
+$(eval $(call gb_CppunitTest_use_ure,sd_import_tests$(1)))
+$(eval $(call gb_CppunitTest_use_vcl,sd_import_tests$(1)))
+
+$(eval $(call gb_CppunitTest_use_components,sd_import_tests$(1),\
+    animations/source/animcore/animcore \
+    basic/util/sb \
+    chart2/source/chartcore \
+    chart2/source/controller/chartcontroller \
+    comphelper/util/comphelp \
+    configmgr/source/configmgr \
+    dbaccess/util/dba \
+    desktop/source/deployment/deployment \
+    drawinglayer/drawinglayer \
+    embeddedobj/util/embobj \
+    emfio/emfio \
+    filter/source/config/cache/filterconfig1 \
+	filter/source/odfflatxml/odfflatxml \
+    filter/source/svg/svgfilter \
+    filter/source/pdf/pdffilter \
+    filter/source/xmlfilteradaptor/xmlfa \
+	filter/source/xmlfilterdetect/xmlfd \
+	filter/source/storagefilterdetect/storagefd \
+    forms/util/frm \
+    framework/util/fwk \
+    i18npool/util/i18npool \
+    linguistic/source/lng \
+    oox/util/oox \
+    package/source/xstor/xstor \
+    package/util/package2 \
+    sax/source/expatwrap/expwrap \
+    sd/util/sd \
+    sd/util/sdfilt \
+    sd/util/sdd \
+    $(if $(ENABLE_POPPLER),sdext/source/pdfimport/pdfimport) \
+    sfx2/util/sfx \
+    sot/util/sot \
+    svl/source/fsstor/fsstorage \
+    svtools/util/svt \
+    svx/util/svxcore \
+    svgio/svgio \
+    toolkit/util/tk \
+    ucb/source/core/ucb1 \
+    ucb/source/ucp/expand/ucpexpand1 \
+    ucb/source/ucp/file/ucpfile1 \
+    ucb/source/ucp/package/ucppkg1 \
+    ucb/source/ucp/tdoc/ucptdoc1 \
+    unotools/util/utl \
+    unoxml/source/rdf/unordf \
+    unoxml/source/service/unoxml \
+    uui/util/uui \
+    vcl/vcl.common \
+    xmlscript/util/xmlscript \
+    xmloff/util/xo \
+    xmlsecurity/util/xmlsecurity \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sd_import_tests$(1)))
+
+$(eval $(call gb_CppunitTest_use_packages,sd_import_tests$(1),\
+	oox_customshapes \
+))
+
+ifneq ($(ENABLE_POPPLER),)
+$(eval $(call gb_CppunitTest_use_executable,sd_import_tests$(1),xpdfimport))
+endif
+
+$(eval $(call gb_CppunitTest_add_arguments,sd_import_tests$(1), \
+    -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
+))
+
+endef
+
+# vim: set noet sw=4 ts=4: