diff --git a/CMake/PackageDepends/MITK_GDCM_Config.cmake b/CMake/PackageDepends/MITK_GDCM_Config.cmake
index a2551c3a3b..6b7107a259 100644
--- a/CMake/PackageDepends/MITK_GDCM_Config.cmake
+++ b/CMake/PackageDepends/MITK_GDCM_Config.cmake
@@ -1,10 +1,5 @@
-if(TARGET itksys)
-  set(ITK_TARGETS_IMPORTED 1)
-endif()
-
-find_package(ITK REQUIRED)
-find_package(GDCM PATHS ${ITK_GDCM_DIR} REQUIRED)
+find_package(GDCM PATHS ${GDCM_DIR} REQUIRED)
 
 list(APPEND ALL_INCLUDE_DIRECTORIES ${GDCM_INCLUDE_DIRS})
 list(APPEND ALL_LIBRARIES ${GDCM_LIBRARIES})
 list(APPEND ALL_LIBRARY_DIRS ${GDCM_LIBRARY_DIRS})
diff --git a/Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt b/Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt
index 71bbd5c9d0..04ed07c363 100644
--- a/Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt
+++ b/Modules/DiffusionImaging/DiffusionCore/CMakeLists.txt
@@ -1,17 +1,8 @@
-find_package(ITK)
-if(ITK_GDCM_DIR)
-  include(${ITK_GDCM_DIR}/GDCMConfig.cmake)
-  if(GDCM_MAJOR_VERSION EQUAL 2)
-    add_definitions(-DGDCM2)
-    set(ITK_USES_GDCM2 1)
-  endif(GDCM_MAJOR_VERSION EQUAL 2)
-endif(ITK_GDCM_DIR)
-
 MITK_CREATE_MODULE( DiffusionCore
   SUBPROJECTS MITK-DTI
   INCLUDE_DIRS Algorithms Algorithms/Reconstruction Algorithms/Registration Algorithms/Reconstruction/MultishellProcessing DicomImport IODataStructures/DiffusionWeightedImages IODataStructures/QBallImages IODataStructures/TensorImages IODataStructures Rendering ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS MitkMapperExt PlanarFigure ImageExtraction SceneSerializationBase
-  PACKAGE_DEPENDS VTK|vtkFiltersProgrammable ITK|ITKDistanceMap+ITKRegistrationCommon+ITKLabelVoting Boost
+  PACKAGE_DEPENDS VTK|vtkFiltersProgrammable ITK|ITKDistanceMap+ITKRegistrationCommon+ITKLabelVoting+ITKVTK Boost
 )
 
 add_subdirectory(Testing)
diff --git a/Modules/DiffusionImaging/DiffusionCore/Testing/CMakeLists.txt b/Modules/DiffusionImaging/DiffusionCore/Testing/CMakeLists.txt
index 3280d50d47..fc5fd31890 100644
--- a/Modules/DiffusionImaging/DiffusionCore/Testing/CMakeLists.txt
+++ b/Modules/DiffusionImaging/DiffusionCore/Testing/CMakeLists.txt
@@ -1,3 +1,4 @@
 MITK_CREATE_MODULE_TESTS()
+mitk_use_modules(TARGET ${TESTDRIVER} PACKAGES ITK|ITKIOTransformBase+ITKDiffusionTensorImage)
 
 mitkAddCustomModuleTest(mitkImageReconstructionTest mitkImageReconstructionTest ${MITK_DATA_DIR}/DiffusionImaging/ImageReconstruction/test.dwi ${MITK_DATA_DIR}/DiffusionImaging/ImageReconstruction/test_dti.dti ${MITK_DATA_DIR}/DiffusionImaging/ImageReconstruction/test_QN0.qbi ${MITK_DATA_DIR}/DiffusionImaging/ImageReconstruction/test_QA0.qbi ${MITK_DATA_DIR}/DiffusionImaging/ImageReconstruction/test_QA6.qbi ${MITK_DATA_DIR}/DiffusionImaging/ImageReconstruction/test_QA4.qbi ${MITK_DATA_DIR}/DiffusionImaging/ImageReconstruction/test_QA5.qbi)