diff --git a/Modules/DiffusionImaging/DiffusionCore/Testing/files.cmake b/Modules/DiffusionImaging/DiffusionCore/Testing/files.cmake
index 648222eafb..4a2a9d22b0 100644
--- a/Modules/DiffusionImaging/DiffusionCore/Testing/files.cmake
+++ b/Modules/DiffusionImaging/DiffusionCore/Testing/files.cmake
@@ -1,17 +1,16 @@
 set(MODULE_TESTS
-  mitkFactoryRegistrationTest.cpp
   mitkDiffusionImageEqualTest.cpp
   mitkNonLocalMeansDenoisingTest.cpp
   mitkDiffusionImageEqualTest.cpp
 )
 
 set(MODULE_CUSTOM_TESTS
   mitkPyramidImageRegistrationMethodTest.cpp
   mitkDWHeadMotionCorrectionTest.cpp
   mitkImageReconstructionTest.cpp
   mitkConvertDWITypeTest.cpp
   mitkExtractSingleShellTest.cpp
   mitkNonLocalMeansDenoisingTest.cpp
   mitkDiffusionDICOMFileReaderTest.cpp
 )
 
diff --git a/Modules/DiffusionImaging/DiffusionCore/Testing/mitkFactoryRegistrationTest.cpp b/Modules/DiffusionImaging/DiffusionCore/Testing/mitkFactoryRegistrationTest.cpp
deleted file mode 100644
index 008606eaa5..0000000000
--- a/Modules/DiffusionImaging/DiffusionCore/Testing/mitkFactoryRegistrationTest.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*===================================================================
-
-The Medical Imaging Interaction Toolkit (MITK)
-
-Copyright (c) German Cancer Research Center,
-Division of Medical and Biological Informatics.
-All rights reserved.
-
-This software is distributed WITHOUT ANY WARRANTY; without
-even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE.
-
-See LICENSE.txt or http://www.mitk.org for details.
-
-===================================================================*/
-
-#include "mitkTestingMacros.h"
-#include "mitkDiffusionImage.h"
-#include "mitkCoreObjectFactory.h"
-
-/**Documentation
- *  Test for factory registration
- */
-int mitkFactoryRegistrationTest(int /* argc */, char* /*argv*/[])
-{
-  // always start with this!
-  MITK_TEST_BEGIN("FactoryRegistrationTest");
-
-  MITK_INFO << "Starting Factory registration test.";
-  MITK_INFO << "Factory has been registered.";
-
-  bool canWrite = false;
-  mitk::DiffusionImage<short>::Pointer img = mitk::DiffusionImage<short>::New();
-  mitk::CoreObjectFactory::FileWriterList fileWriters = mitk::CoreObjectFactory::GetInstance()->GetFileWriters();
-  MITK_INFO << "Looking for diffusion image writer.";
-  for (mitk::CoreObjectFactory::FileWriterList::iterator it = fileWriters.begin() ; it != fileWriters.end() ; ++it)
-  {
-    if ( (*it)->CanWriteBaseDataType(img.GetPointer()) )
-    {
-      MITK_INFO << "Found diffusion image writer.";
-      canWrite = true;
-      break;
-    }
-  }
-
-  MITK_TEST_CONDITION_REQUIRED(canWrite,"Testing factory registration");
-
-  // always end with this!
-  MITK_TEST_END();
-}