diff --git a/Core/Code/Testing/CMakeLists.txt b/Core/Code/Testing/CMakeLists.txt
index 8ad3992bf4..643e2cc141 100644
--- a/Core/Code/Testing/CMakeLists.txt
+++ b/Core/Code/Testing/CMakeLists.txt
@@ -1,8 +1,11 @@
 MITK_CREATE_MODULE_TESTS(LABELS MITK-Core)
 # MITK_INSTALL_TARGETS(EXECUTABLES MitkTestDriver)
 
 ADD_TEST(mitkPicFileReaderTest_emptyFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkPicFileReaderTest ${CMAKE_CURRENT_SOURCE_DIR}/Data/emptyFile.pic)
 SET_PROPERTY(TEST mitkPicFileReaderTest_emptyFile PROPERTY LABELS MITK-Core)
 
 ADD_TEST(mitkPicFileReaderTest_emptyGzipFile ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkPicFileReaderTest ${CMAKE_CURRENT_SOURCE_DIR}/Data/emptyFile.pic.gz)
 SET_PROPERTY(TEST mitkPicFileReaderTest_emptyGzipFile PROPERTY LABELS MITK-Core)
+
+ADD_TEST(mitkDICOMLocaleTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkDICOMLocaleTest ${MITK_DATA_DIR}/spacing-ok.dcm)
+SET_PROPERTY(TEST mitkDICOMLocaleTest PROPERTY LABELS MITK-Core)
diff --git a/Core/Code/Testing/files.cmake b/Core/Code/Testing/files.cmake
index 5a83571bcb..f0bfaa88bb 100644
--- a/Core/Code/Testing/files.cmake
+++ b/Core/Code/Testing/files.cmake
@@ -1,92 +1,92 @@
 
 # tests with no extra command line parameter
 SET(MODULE_TESTS
   mitkCoreObjectFactoryTest.cpp 
   mitkPointSetWriterTest.cpp
   mitkMaterialTest.cpp
   mitkDataNodeTest.cpp
   mitkActionTest.cpp
   mitkDataStorageTest.cpp
   mitkEnumerationPropertyTest.cpp
   mitkEventMapperTest.cpp
   mitkEventTest.cpp
   mitkFocusManagerTest.cpp
   mitkGenericPropertyTest.cpp
   mitkGeometry3DTest.cpp
   mitkGeometryDataToSurfaceFilterTest.cpp
   mitkGlobalInteractionTest.cpp
   mitkImageDataItemTest.cpp
   #mitkImageMapper2DTest.cpp
   mitkImageTest.cpp
   mitkImageGeneratorTest.cpp
   mitkBaseDataTest.cpp
   #mitkImageToItkTest.cpp
   mitkInteractorTest.cpp
   mitkITKThreadingTest.cpp
   # mitkLevelWindowManagerTest.cpp
   mitkLevelWindowTest.cpp
   mitkMessageTest.cpp
   #mitkPipelineSmartPointerCorrectnessTest.cpp
   mitkPixelTypeTest.cpp
   mitkPlaneGeometryTest.cpp
   mitkPointSetFileIOTest.cpp
   mitkPointSetTest.cpp
   mitkPointSetInteractorTest.cpp
   mitkNodeDependentPointSetInteractorTest.cpp
   mitkPropertyListTest.cpp
   #mitkRegistrationBaseTest.cpp
   #mitkSegmentationInterpolationTest.cpp
   mitkSlicedGeometry3DTest.cpp
   mitkSliceNavigationControllerTest.cpp
   mitkStateMachineTest.cpp
   mitkStateMachineFactoryTest.cpp
   mitkStateTest.cpp
   mitkSurfaceTest.cpp
   mitkSurfaceToSurfaceFilterTest.cpp
   mitkTimeSlicedGeometryTest.cpp
   mitkTransitionTest.cpp
   mitkUndoControllerTest.cpp
   mitkVtkWidgetRenderingTest.cpp
   mitkVerboseLimitedLinearUndoTest.cpp
   mitkWeakPointerTest.cpp
   mitkTransferFunctionTest.cpp
   #mitkAbstractTransformGeometryTest.cpp
   #mitkPicFileIOTest.cpp
   mitkStepperTest.cpp
   itkTotalVariationDenoisingImageFilterTest.cpp
-  mitkDICOMLocaleTest.cpp
   mitkPointSetLocaleTest.cpp
   mitkRenderingManagerTest.cpp
   vtkMitkThickSlicesFilterTest.cpp
   mitkNodePredicateSourceTest.cpp
 )
 
 # test with image filename as an extra command line parameter
 SET(MODULE_IMAGE_TESTS
   mitkSurfaceVtkWriterTest.cpp
   mitkPicFileWriterTest.cpp
   mitkImageWriterTest.cpp
   #mitkImageSliceSelectorTest.cpp
   mitkImageTimeSelectorTest.cpp
   mitkPicFileReaderTest.cpp
   # mitkVtkPropRendererTest.cpp
   mitkDataNodeFactoryTest.cpp
   #mitkSTLFileReaderTest.cpp
 )
 
 # list of images for which the tests are run
 SET(MODULE_TESTIMAGES
   US4DCyl.pic.gz
   Pic3D.pic.gz
   Pic2DplusT.pic.gz
   BallBinary30x30x30.pic.gz
   binary.stl
   ball.stl
 )
 
 SET(MODULE_CUSTOM_TESTS 
     #mitkLabeledImageToSurfaceFilterTest.cpp
     #mitkExternalToolsTest.cpp
     mitkDicomSeriesReaderTest.cpp
+    mitkDICOMLocaleTest.cpp
 )
 
diff --git a/Core/Code/Testing/mitkDICOMLocaleTest.cpp b/Core/Code/Testing/mitkDICOMLocaleTest.cpp
index fa497aa479..4ec22eb3e5 100644
--- a/Core/Code/Testing/mitkDICOMLocaleTest.cpp
+++ b/Core/Code/Testing/mitkDICOMLocaleTest.cpp
@@ -1,131 +1,124 @@
 /*=========================================================================
  
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision: 1.12 $
  
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
  
 =========================================================================*/
 
 /*
  This test is meant to reproduce the following error:
  
  - The machine or current user has a German locale.
  - This esp. means that stream IO expects the decimal separator as a comma: ","
  - DICOM files use a point "." as the decimal separator to be locale independent
- - The parser used by MITK (ITK's GDCM) seems to use the current locale instead of the "C" or "POSIX" locale
+ - The parser used by MITK (ITK's GDC) seems to use the current locale instead of the "C" or "POSIX" locale
  - This leads to spacings (and probably other numbers) being trimmed/rounded,
    e.g. the correct spacing of 0.314 is read as 1.0 etc.
 
- MITK shold work around this behavior. This test is meant to verify any workaround
- and will be activated once such a workaround is available.
-
 */
 
 #include "mitkDataNodeFactory.h"
 #include "mitkStandardFileLocations.h"
 
 #include "mitkTestingMacros.h"
 
 #include <list>
 #include <locale>
 #include <locale.h>
   
 bool mitkDICOMLocaleTestChangeLocale(const std::string& locale)
 {
   try
   {
     MITK_TEST_OUTPUT(<< " ** Changing locale from " << setlocale(LC_ALL, NULL) << " to '" << locale << "'");
     setlocale(LC_ALL, locale.c_str());
     std::locale l( locale.c_str() );
     std::cin.imbue(l);
     return true;
   }
   catch(...)
   {
     MITK_TEST_OUTPUT(<< "Could not activate locale " << locale);
     return false;
   }
 
 }
 
-void mitkDICOMLocaleTestWithReferenceImage()
+void mitkDICOMLocaleTestWithReferenceImage(std::string filename)
 {
-  mitk::StandardFileLocations::Pointer locator = mitk::StandardFileLocations::GetInstance();
-  MITK_TEST_CONDITION_REQUIRED(locator.IsNotNull(),"Instantiating StandardFileLocations");
-  std::string filename = locator->FindFile("spacing-ok.dcm", "Core/Code/Testing/Data/");
-
   mitk::Image::Pointer image;
   mitk::DataNodeFactory::Pointer factory = mitk::DataNodeFactory::New();
   factory->SetFileName( filename );
   factory->Update();
   MITK_TEST_CONDITION_REQUIRED(factory->GetNumberOfOutputs() > 0, "file loaded");
 
   mitk::DataNode::Pointer node = factory->GetOutput( 0 );
   image = dynamic_cast<mitk::Image*>(node->GetData());
   if(image.IsNull())
   {
     MITK_TEST_FAILED_MSG(<< "File "<< filename << " is not an image - test will not be applied." );
   
     return;
   }  
-    
-  MITK_TEST_OUTPUT(<< "File "<< filename << " could be loaded." );
-
-  MITK_TEST_OUTPUT(<< "MITK image reports pixel spacing of " << image->GetGeometry()->GetSpacing()[0] << " " << image->GetGeometry()->GetSpacing()[1] );
-  MITK_TEST_CONDITION_REQUIRED(image->GetGeometry()->GetSpacing()[0] - 0.3141592 < 0.0000001, "correct x spacing");
-  MITK_TEST_CONDITION_REQUIRED(image->GetGeometry()->GetSpacing()[1] - 0.3141592 < 0.0000001, "correct y spacing");
+  MITK_TEST_CONDITION_REQUIRED(mitk::Equal(image->GetGeometry()->GetSpacing()[0], 0.3141592), "correct x spacing");
+  MITK_TEST_CONDITION_REQUIRED(mitk::Equal(image->GetGeometry()->GetSpacing()[1], 0.3141592), "correct y spacing");
 }
 
-int mitkDICOMLocaleTest(int /*argc*/, char* /*argv*/ [])
+int mitkDICOMLocaleTest(int argc, char* argv[])
 {
   MITK_TEST_BEGIN("DICOMLocaleTest");
 
+  MITK_TEST_CONDITION_REQUIRED(argc >= 2, "Test if a file to load has been specified");
+
+  std::string filename = argv[1];
+
   // load a reference DICOM file with the "C" locale being set
   mitkDICOMLocaleTestChangeLocale("C");
-  mitkDICOMLocaleTestWithReferenceImage();
+  mitkDICOMLocaleTestWithReferenceImage(filename);
   // load a reference DICOM file with German locales being set
   typedef std::list<std::string> StringList;
   StringList alllocales;
   alllocales.push_back("de_DE");
   alllocales.push_back("de_DE.utf8");
   alllocales.push_back("de_DE.UTF8");
   alllocales.push_back("de_DE@euro");
   alllocales.push_back("German_Germany");
 
   // QuickFix for MAC OS X
   // See for more the Bug #3894 comments
 #if defined (__APPLE__) || defined(MACOSX)
   alllocales.push_back("C");
 #endif
 
   unsigned int numberOfTestedGermanLocales(0);
 
   for (StringList::iterator iter = alllocales.begin();
        iter != alllocales.end();
        ++iter)
   {
     if ( mitkDICOMLocaleTestChangeLocale(*iter) )
     {
       ++numberOfTestedGermanLocales;
-      mitkDICOMLocaleTestWithReferenceImage();
+      mitkDICOMLocaleTestWithReferenceImage(filename);
     }
   }
 
   if(numberOfTestedGermanLocales == 0)
   {
     MITK_TEST_OUTPUT(<< "Warning: No German locale was found on the system.");
   }
   //MITK_TEST_CONDITION_REQUIRED( numberOfTestedGermanLocales > 0, "Verify that at least one German locale has been tested.");
  
   MITK_TEST_END();
 }