diff --git a/Tests/RunCMake/CPack/CMakeLists.txt b/Tests/RunCMake/CPack/CMakeLists.txt
index c4d9d5da72..e06fa1cdd9 100644
--- a/Tests/RunCMake/CPack/CMakeLists.txt
+++ b/Tests/RunCMake/CPack/CMakeLists.txt
@@ -7,10 +7,5 @@ string(TOLOWER "${RunCMake_TEST_FILE_PREFIX}" CPACK_PACKAGE_NAME)
 
 include(tests/${RunCMake_TEST_FILE_PREFIX}/test.cmake)
 
-# include test generator specifics
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${GENERATOR_TYPE}/${RunCMake_TEST_FILE_PREFIX}-specifics.cmake")
-  include("${GENERATOR_TYPE}/${RunCMake_TEST_FILE_PREFIX}-specifics.cmake")
-endif()
-
 set(CPACK_GENERATOR "${GENERATOR_TYPE}")
 include(CPack)
diff --git a/Tests/RunCMake/CPack/DEB/COMPONENTS_EMPTY_DIR-specifics.cmake b/Tests/RunCMake/CPack/DEB/COMPONENTS_EMPTY_DIR-specifics.cmake
deleted file mode 100644
index 4b4ac8dc21..0000000000
--- a/Tests/RunCMake/CPack/DEB/COMPONENTS_EMPTY_DIR-specifics.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CPACK_PACKAGE_CONTACT "someone")
-set(CPACK_DEB_COMPONENT_INSTALL "ON")
-set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
diff --git a/Tests/RunCMake/CPack/DEB/CUSTOM_NAMES-specifics.cmake b/Tests/RunCMake/CPack/DEB/CUSTOM_NAMES-specifics.cmake
deleted file mode 100644
index c64f16115b..0000000000
--- a/Tests/RunCMake/CPack/DEB/CUSTOM_NAMES-specifics.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-set(CPACK_PACKAGE_CONTACT "someone")
-set(CPACK_DEB_COMPONENT_INSTALL "ON")
-
-set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
-set(CPACK_DEBIAN_PKG_2_PACKAGE_NAME "second")
-set(CPACK_DEBIAN_PKG_3_FILE_NAME "pkg_3_abc.deb")
diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
deleted file mode 100644
index 5f82cc64a8..0000000000
--- a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-set(CPACK_PACKAGE_CONTACT "someone")
-set(CPACK_DEB_COMPONENT_INSTALL "ON")
-#intentionaly commented out to test old file naming
-#set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
-
-# false by default
-set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS FALSE)
-# FIXME can not be tested as libraries first have to be part of a package in order
-# to determine their dependencies and we can not be certain if there will be any
-set(CPACK_DEBIAN_APPLICATIONS_AUTO_PACKAGE_SHLIBDEPS TRUE)
-
-foreach(dependency_type_ DEPENDS CONFLICTS PREDEPENDS ENHANCES BREAKS REPLACES RECOMMENDS SUGGESTS)
-  string(TOLOWER "${dependency_type_}" lower_dependency_type_)
-
-  set(CPACK_DEBIAN_PACKAGE_${dependency_type_} "${lower_dependency_type_}-default, ${lower_dependency_type_}-default-b")
-  set(CPACK_DEBIAN_APPLICATIONS_PACKAGE_${dependency_type_} "${lower_dependency_type_}-application, ${lower_dependency_type_}-application-b")
-  set(CPACK_DEBIAN_APPLICATIONS_AUTO_PACKAGE_${dependency_type_} "${lower_dependency_type_}-application, ${lower_dependency_type_}-application-b")
-  set(CPACK_DEBIAN_HEADERS_PACKAGE_${dependency_type_} "${lower_dependency_type_}-headers")
-endforeach()
-
-set(CPACK_DEBIAN_PACKAGE_PROVIDES "provided-default, provided-default-b")
-set(CPACK_DEBIAN_LIBS_PACKAGE_PROVIDES "provided-lib")
-set(CPACK_DEBIAN_LIBS_AUTO_PACKAGE_PROVIDES "provided-lib_auto, provided-lib_auto-b")
diff --git a/Tests/RunCMake/CPack/DEB/EMPTY_DIR-specifics.cmake b/Tests/RunCMake/CPack/DEB/EMPTY_DIR-specifics.cmake
deleted file mode 100644
index 4e9a2e7517..0000000000
--- a/Tests/RunCMake/CPack/DEB/EMPTY_DIR-specifics.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set(CPACK_PACKAGE_CONTACT "someone")
-set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
diff --git a/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-specifics.cmake b/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-specifics.cmake
deleted file mode 100644
index 39a6be4989..0000000000
--- a/Tests/RunCMake/CPack/DEB/LONG_FILENAMES-specifics.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(CPACK_PACKAGE_CONTACT "someone")
-set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
-set(CPACK_DEBIAN_ARCHIVE_TYPE "gnutar")
diff --git a/Tests/RunCMake/CPack/DEB/MINIMAL-specifics.cmake b/Tests/RunCMake/CPack/DEB/MINIMAL-specifics.cmake
deleted file mode 100644
index 4e9a2e7517..0000000000
--- a/Tests/RunCMake/CPack/DEB/MINIMAL-specifics.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set(CPACK_PACKAGE_CONTACT "someone")
-set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
diff --git a/Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-specifics.cmake b/Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-specifics.cmake
deleted file mode 100644
index 25bd2e7080..0000000000
--- a/Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-specifics.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-set(CPACK_PACKAGE_CONTACT "someone")
-set(CPACK_DEB_COMPONENT_INSTALL "ON")
-set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
-
-set(CPACK_DEBIAN_PACKAGE_SECTION "default")
-set(CPACK_DEBIAN_PKG_2_PACKAGE_NAME "second")
-set(CPACK_DEBIAN_PKG_2_PACKAGE_SECTION "second_group")
diff --git a/Tests/RunCMake/CPack/RPM/CUSTOM_NAMES-specifics.cmake b/Tests/RunCMake/CPack/RPM/CUSTOM_NAMES-specifics.cmake
deleted file mode 100644
index 575aa01eb2..0000000000
--- a/Tests/RunCMake/CPack/RPM/CUSTOM_NAMES-specifics.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-set(CPACK_RPM_COMPONENT_INSTALL "ON")
-
-set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
-set(CPACK_RPM_PKG_2_PACKAGE_NAME "second")
-set(CPACK_RPM_PKG_3_FILE_NAME "pkg_3_abc.rpm")
diff --git a/Tests/RunCMake/CPack/RPM/DEPENDENCIES-specifics.cmake b/Tests/RunCMake/CPack/RPM/DEPENDENCIES-specifics.cmake
deleted file mode 100644
index 8b7fb1e981..0000000000
--- a/Tests/RunCMake/CPack/RPM/DEPENDENCIES-specifics.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-set(CPACK_RPM_COMPONENT_INSTALL "ON")
-
-# FIXME auto autoprov is not tested at the moment as Ubuntu 15.04 rpmbuild
-# does not use them correctly: https://bugs.launchpad.net/rpm/+bug/1475755
-set(CPACK_RPM_PACKAGE_AUTOREQ "no")
-set(CPACK_RPM_PACKAGE_AUTOPROV "no")
-set(CPACK_RPM_APPLICATIONS_AUTO_PACKAGE_AUTOREQPROV "yes")
-set(CPACK_RPM_LIBS_AUTO_PACKAGE_AUTOREQPROV "yes")
-
-set(CPACK_RPM_PACKAGE_REQUIRES "depend-default, depend-default-b")
-set(CPACK_RPM_APPLICATIONS_PACKAGE_REQUIRES "depend-application, depend-application-b")
-set(CPACK_RPM_APPLICATIONS_AUTO_PACKAGE_REQUIRES "depend-application, depend-application-b")
-set(CPACK_RPM_HEADERS_PACKAGE_REQUIRES "depend-headers")
-
-set(CPACK_RPM_PACKAGE_CONFLICTS "conflict-default, conflict-default-b")
-set(CPACK_RPM_APPLICATIONS_PACKAGE_CONFLICTS "conflict-application, conflict-application-b")
-set(CPACK_RPM_APPLICATIONS_AUTO_PACKAGE_CONFLICTS "conflict-application, conflict-application-b")
-set(CPACK_RPM_HEADERS_PACKAGE_CONFLICTS "conflict-headers")
-
-set(CPACK_RPM_PACKAGE_PROVIDES "provided-default, provided-default-b")
-set(CPACK_RPM_LIBS_PACKAGE_PROVIDES "provided-lib")
-set(CPACK_RPM_LIBS_AUTO_PACKAGE_PROVIDES "provided-lib_auto, provided-lib_auto-b")
diff --git a/Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-specifics.cmake b/Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-specifics.cmake
deleted file mode 100644
index 4eb53c3809..0000000000
--- a/Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-specifics.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-set(CPACK_RPM_COMPONENT_INSTALL "ON")
-
-set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE
-  "${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh")
-set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE
-  "${CMAKE_CURRENT_BINARY_DIR}/post_install.sh")
-set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE
-  "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall.sh")
-set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE
-  "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall.sh")
-
-set(CPACK_RPM_foo_PRE_INSTALL_SCRIPT_FILE
-  "${CMAKE_CURRENT_BINARY_DIR}/pre_install_foo.sh")
-set(CPACK_RPM_foo_POST_INSTALL_SCRIPT_FILE
-  "${CMAKE_CURRENT_BINARY_DIR}/post_install_foo.sh")
-set(CPACK_RPM_foo_PRE_UNINSTALL_SCRIPT_FILE
-  "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall_foo.sh")
-set(CPACK_RPM_foo_POST_UNINSTALL_SCRIPT_FILE
-  "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall_foo.sh")
diff --git a/Tests/RunCMake/CPack/RPM/PER_COMPONENT_FIELDS-specifics.cmake b/Tests/RunCMake/CPack/RPM/PER_COMPONENT_FIELDS-specifics.cmake
deleted file mode 100644
index 524ef0cd36..0000000000
--- a/Tests/RunCMake/CPack/RPM/PER_COMPONENT_FIELDS-specifics.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-set(CPACK_RPM_COMPONENT_INSTALL "ON")
-
-set(CPACK_RPM_PACKAGE_GROUP "default")
-set(CPACK_RPM_PKG_2_PACKAGE_NAME "second")
-set(CPACK_RPM_PKG_2_PACKAGE_GROUP "second_group")
diff --git a/Tests/RunCMake/CPack/TGZ/COMPONENTS_EMPTY_DIR-specifics.cmake b/Tests/RunCMake/CPack/TGZ/COMPONENTS_EMPTY_DIR-specifics.cmake
deleted file mode 100644
index 81a5035a3d..0000000000
--- a/Tests/RunCMake/CPack/TGZ/COMPONENTS_EMPTY_DIR-specifics.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(CPACK_ARCHIVE_COMPONENT_INSTALL "ON")
diff --git a/Tests/RunCMake/CPack/tests/COMPONENTS_EMPTY_DIR/test.cmake b/Tests/RunCMake/CPack/tests/COMPONENTS_EMPTY_DIR/test.cmake
index 9cd91af0b0..1ad01c1104 100644
--- a/Tests/RunCMake/CPack/tests/COMPONENTS_EMPTY_DIR/test.cmake
+++ b/Tests/RunCMake/CPack/tests/COMPONENTS_EMPTY_DIR/test.cmake
@@ -1,3 +1,13 @@
+if(GENERATOR_TYPE STREQUAL "DEB")
+  set(CPACK_PACKAGE_CONTACT "someone")
+  set(CPACK_DEB_COMPONENT_INSTALL "ON")
+  set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
+elseif(GENERATOR_TYPE STREQUAL "RPM")
+  set(CPACK_RPM_COMPONENT_INSTALL "ON")
+elseif(GENERATOR_TYPE STREQUAL "TGZ")
+  set(CPACK_ARCHIVE_COMPONENT_INSTALL "ON")
+endif()
+
 set(CPACK_COMPONENTS_ALL test)
 install(DIRECTORY DESTINATION empty
         COMPONENT test)
diff --git a/Tests/RunCMake/CPack/tests/CUSTOM_NAMES/test.cmake b/Tests/RunCMake/CPack/tests/CUSTOM_NAMES/test.cmake
index 115864fed7..3185e9f1e9 100644
--- a/Tests/RunCMake/CPack/tests/CUSTOM_NAMES/test.cmake
+++ b/Tests/RunCMake/CPack/tests/CUSTOM_NAMES/test.cmake
@@ -1,4 +1,17 @@
-set(CPACK_RPM_COMPONENT_INSTALL "ON")
+if(GENERATOR_TYPE STREQUAL "DEB")
+  set(CPACK_PACKAGE_CONTACT "someone")
+  set(CPACK_DEB_COMPONENT_INSTALL "ON")
+
+  set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
+  set(CPACK_DEBIAN_PKG_2_PACKAGE_NAME "second")
+  set(CPACK_DEBIAN_PKG_3_FILE_NAME "pkg_3_abc.deb")
+elseif(GENERATOR_TYPE STREQUAL "RPM")
+  set(CPACK_RPM_COMPONENT_INSTALL "ON")
+
+  set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
+  set(CPACK_RPM_PKG_2_PACKAGE_NAME "second")
+  set(CPACK_RPM_PKG_3_FILE_NAME "pkg_3_abc.rpm")
+endif()
 
 install(FILES CMakeLists.txt DESTINATION foo COMPONENT pkg_1)
 install(FILES CMakeLists.txt DESTINATION foo COMPONENT pkg_2)
diff --git a/Tests/RunCMake/CPack/tests/DEPENDENCIES/test.cmake b/Tests/RunCMake/CPack/tests/DEPENDENCIES/test.cmake
index 4499a7aad7..cabbba8df3 100644
--- a/Tests/RunCMake/CPack/tests/DEPENDENCIES/test.cmake
+++ b/Tests/RunCMake/CPack/tests/DEPENDENCIES/test.cmake
@@ -1,3 +1,52 @@
+if(GENERATOR_TYPE STREQUAL "DEB")
+  set(CPACK_PACKAGE_CONTACT "someone")
+  set(CPACK_DEB_COMPONENT_INSTALL "ON")
+  #intentionaly commented out to test old file naming
+  #set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
+
+  # false by default
+  set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS FALSE)
+  # FIXME can not be tested as libraries first have to be part of a package in order
+  # to determine their dependencies and we can not be certain if there will be any
+  set(CPACK_DEBIAN_APPLICATIONS_AUTO_PACKAGE_SHLIBDEPS TRUE)
+
+  foreach(dependency_type_ DEPENDS CONFLICTS PREDEPENDS ENHANCES BREAKS REPLACES RECOMMENDS SUGGESTS)
+    string(TOLOWER "${dependency_type_}" lower_dependency_type_)
+
+    set(CPACK_DEBIAN_PACKAGE_${dependency_type_} "${lower_dependency_type_}-default, ${lower_dependency_type_}-default-b")
+    set(CPACK_DEBIAN_APPLICATIONS_PACKAGE_${dependency_type_} "${lower_dependency_type_}-application, ${lower_dependency_type_}-application-b")
+    set(CPACK_DEBIAN_APPLICATIONS_AUTO_PACKAGE_${dependency_type_} "${lower_dependency_type_}-application, ${lower_dependency_type_}-application-b")
+    set(CPACK_DEBIAN_HEADERS_PACKAGE_${dependency_type_} "${lower_dependency_type_}-headers")
+  endforeach()
+
+  set(CPACK_DEBIAN_PACKAGE_PROVIDES "provided-default, provided-default-b")
+  set(CPACK_DEBIAN_LIBS_PACKAGE_PROVIDES "provided-lib")
+  set(CPACK_DEBIAN_LIBS_AUTO_PACKAGE_PROVIDES "provided-lib_auto, provided-lib_auto-b")
+elseif(GENERATOR_TYPE STREQUAL "RPM")
+  set(CPACK_RPM_COMPONENT_INSTALL "ON")
+
+  # FIXME auto autoprov is not tested at the moment as Ubuntu 15.04 rpmbuild
+  # does not use them correctly: https://bugs.launchpad.net/rpm/+bug/1475755
+  set(CPACK_RPM_PACKAGE_AUTOREQ "no")
+  set(CPACK_RPM_PACKAGE_AUTOPROV "no")
+  set(CPACK_RPM_APPLICATIONS_AUTO_PACKAGE_AUTOREQPROV "yes")
+  set(CPACK_RPM_LIBS_AUTO_PACKAGE_AUTOREQPROV "yes")
+
+  set(CPACK_RPM_PACKAGE_REQUIRES "depend-default, depend-default-b")
+  set(CPACK_RPM_APPLICATIONS_PACKAGE_REQUIRES "depend-application, depend-application-b")
+  set(CPACK_RPM_APPLICATIONS_AUTO_PACKAGE_REQUIRES "depend-application, depend-application-b")
+  set(CPACK_RPM_HEADERS_PACKAGE_REQUIRES "depend-headers")
+
+  set(CPACK_RPM_PACKAGE_CONFLICTS "conflict-default, conflict-default-b")
+  set(CPACK_RPM_APPLICATIONS_PACKAGE_CONFLICTS "conflict-application, conflict-application-b")
+  set(CPACK_RPM_APPLICATIONS_AUTO_PACKAGE_CONFLICTS "conflict-application, conflict-application-b")
+  set(CPACK_RPM_HEADERS_PACKAGE_CONFLICTS "conflict-headers")
+
+  set(CPACK_RPM_PACKAGE_PROVIDES "provided-default, provided-default-b")
+  set(CPACK_RPM_LIBS_PACKAGE_PROVIDES "provided-lib")
+  set(CPACK_RPM_LIBS_AUTO_PACKAGE_PROVIDES "provided-lib_auto, provided-lib_auto-b")
+endif()
+
 set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
 
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_lib.hpp"
diff --git a/Tests/RunCMake/CPack/tests/EMPTY_DIR/test.cmake b/Tests/RunCMake/CPack/tests/EMPTY_DIR/test.cmake
index 7bec17dfd1..e435cedd25 100644
--- a/Tests/RunCMake/CPack/tests/EMPTY_DIR/test.cmake
+++ b/Tests/RunCMake/CPack/tests/EMPTY_DIR/test.cmake
@@ -1,2 +1,7 @@
+if(GENERATOR_TYPE STREQUAL "DEB")
+  set(CPACK_PACKAGE_CONTACT "someone")
+  set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
+endif()
+
 install(DIRECTORY DESTINATION empty
         COMPONENT test)
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
index 9b3e856405..e16f8e1087 100644
--- a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
@@ -1,3 +1,25 @@
+if(GENERATOR_TYPE STREQUAL "RPM")
+  set(CPACK_RPM_COMPONENT_INSTALL "ON")
+
+  set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE
+    "${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh")
+  set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE
+    "${CMAKE_CURRENT_BINARY_DIR}/post_install.sh")
+  set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE
+    "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall.sh")
+  set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE
+    "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall.sh")
+
+  set(CPACK_RPM_foo_PRE_INSTALL_SCRIPT_FILE
+    "${CMAKE_CURRENT_BINARY_DIR}/pre_install_foo.sh")
+  set(CPACK_RPM_foo_POST_INSTALL_SCRIPT_FILE
+    "${CMAKE_CURRENT_BINARY_DIR}/post_install_foo.sh")
+  set(CPACK_RPM_foo_PRE_UNINSTALL_SCRIPT_FILE
+    "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall_foo.sh")
+  set(CPACK_RPM_foo_POST_UNINSTALL_SCRIPT_FILE
+    "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall_foo.sh")
+endif()
+
 set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
 
 # default
diff --git a/Tests/RunCMake/CPack/tests/LONG_FILENAMES/test.cmake b/Tests/RunCMake/CPack/tests/LONG_FILENAMES/test.cmake
index 3370a50212..f6656c6682 100644
--- a/Tests/RunCMake/CPack/tests/LONG_FILENAMES/test.cmake
+++ b/Tests/RunCMake/CPack/tests/LONG_FILENAMES/test.cmake
@@ -1,3 +1,9 @@
+if(GENERATOR_TYPE STREQUAL "DEB")
+  set(CPACK_PACKAGE_CONTACT "someone")
+  set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
+  set(CPACK_DEBIAN_ARCHIVE_TYPE "gnutar")
+endif()
+
 set(LONG_FILENAME
   "${CMAKE_CURRENT_BINARY_DIR}/llllllllll_oooooooooo_nnnnnnnnnn_gggggggggg_ffffffffff_iiiiiiiiii_llllllllll_eeeeeeeeee_nnnnnnnnnn_aaaaaaaaaa_mmmmmmmmmm_eeeeeeeeee.txt")
 
diff --git a/Tests/RunCMake/CPack/tests/MINIMAL/test.cmake b/Tests/RunCMake/CPack/tests/MINIMAL/test.cmake
index 83ed0f2bac..2182f46492 100644
--- a/Tests/RunCMake/CPack/tests/MINIMAL/test.cmake
+++ b/Tests/RunCMake/CPack/tests/MINIMAL/test.cmake
@@ -1 +1,6 @@
+if(GENERATOR_TYPE STREQUAL "DEB")
+  set(CPACK_PACKAGE_CONTACT "someone")
+  set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
+endif()
+
 install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
diff --git a/Tests/RunCMake/CPack/tests/PER_COMPONENT_FIELDS/test.cmake b/Tests/RunCMake/CPack/tests/PER_COMPONENT_FIELDS/test.cmake
index 703c1b75dd..b042092730 100644
--- a/Tests/RunCMake/CPack/tests/PER_COMPONENT_FIELDS/test.cmake
+++ b/Tests/RunCMake/CPack/tests/PER_COMPONENT_FIELDS/test.cmake
@@ -1,3 +1,19 @@
+if(GENERATOR_TYPE STREQUAL "DEB")
+  set(CPACK_PACKAGE_CONTACT "someone")
+  set(CPACK_DEB_COMPONENT_INSTALL "ON")
+  set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
+
+  set(CPACK_DEBIAN_PACKAGE_SECTION "default")
+  set(CPACK_DEBIAN_PKG_2_PACKAGE_NAME "second")
+  set(CPACK_DEBIAN_PKG_2_PACKAGE_SECTION "second_group")
+elseif(GENERATOR_TYPE STREQUAL "RPM")
+  set(CPACK_RPM_COMPONENT_INSTALL "ON")
+
+  set(CPACK_RPM_PACKAGE_GROUP "default")
+  set(CPACK_RPM_PKG_2_PACKAGE_NAME "second")
+  set(CPACK_RPM_PKG_2_PACKAGE_GROUP "second_group")
+endif()
+
 install(FILES CMakeLists.txt DESTINATION foo COMPONENT pkg_1)
 install(FILES CMakeLists.txt DESTINATION foo COMPONENT pkg_2)
 install(FILES CMakeLists.txt DESTINATION foo COMPONENT pkg_3)