diff --git a/Modules/IGT/Testing/files.cmake b/Modules/IGT/Testing/files.cmake
index 5495c8a60c..25f0f80f39 100644
--- a/Modules/IGT/Testing/files.cmake
+++ b/Modules/IGT/Testing/files.cmake
@@ -1,45 +1,46 @@
 SET(MODULE_TESTS
    mitkCameraVisualizationTest.cpp
    mitkClaronInterfaceTest.cpp
    mitkClaronToolTest.cpp
    mitkClaronTrackingDeviceTest.cpp
    mitkInternalTrackingToolTest.cpp
    mitkNavigationDataDisplacementFilterTest.cpp
    mitkNavigationDataLandmarkTransformFilterTest.cpp
    mitkNavigationDataObjectVisualizationFilterTest.cpp
    mitkNavigationDataTest.cpp
    mitkNavigationDataRecorderTest.cpp
    mitkNavigationDataReferenceTransformFilterTest.cpp
    mitkNavigationDataSequentialPlayerTest.cpp
    mitkNavigationDataToMessageFilterTest.cpp
    mitkNavigationDataToNavigationDataFilterTest.cpp
    mitkNavigationDataToPointSetFilterTest.cpp
    mitkNavigationDataTransformFilterTest.cpp
    mitkNDIPassiveToolTest.cpp
    mitkNDIProtocolTest.cpp
    mitkNDITrackingDeviceTest.cpp
    mitkTimeStampTest.cpp
    mitkTrackingVolumeGeneratorTest.cpp
    mitkTrackingDeviceTest.cpp
    mitkTrackingToolTest.cpp
    mitkVirtualTrackingDeviceTest.cpp
    mitkNavigationDataPlayerTest.cpp
    mitkTrackingDeviceSourceTest.cpp
+   mitkTrackingDeviceSourceConfiguratorTest.cpp
 
    # ------------------ Navigation Tool Management Tests -------------------
    mitkNavigationToolStorageTest.cpp
    mitkNavigationToolStorageSerializerAndDeserializerTest.cpp
    mitkNavigationToolTest.cpp
    mitkNavigationToolReaderAndWriterTest.cpp #deactivated, see bug #3461
    # -----------------------------------------------------------------------
 
    # ------------------ Deavtivated Tests ----------------------------------
-   
+
    # -----------------------------------------------------------------------
 )
 
 SET(MODULE_CUSTOM_TESTS
   mitkNDIAuroraHardwareTest.cpp
   mitkNDIPolarisHardwareTest.cpp
   mitkClaronTrackingDeviceHardwareTest.cpp
 )
\ No newline at end of file
diff --git a/Modules/IGT/Testing/mitkTrackingDeviceSourceConfiguratorTest.cpp b/Modules/IGT/Testing/mitkTrackingDeviceSourceConfiguratorTest.cpp
new file mode 100644
index 0000000000..ab62099932
--- /dev/null
+++ b/Modules/IGT/Testing/mitkTrackingDeviceSourceConfiguratorTest.cpp
@@ -0,0 +1,56 @@
+/*=========================================================================
+
+Program:   Medical Imaging & Interaction Toolkit
+Language:  C++
+Date:      $Date: 2008-02-25 17:27:17 +0100 (Mo, 25 Feb 2008) $
+Version:   $Revision: 7837 $
+
+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.
+
+=========================================================================*/
+
+#include "mitkTrackingDeviceSourceConfigurator.h"
+#include <mitkClaronTrackingDevice.h>
+#include <mitkNavigationTool.h>
+#include <mitkTestingMacros.h>
+
+class mitkTrackingDeviceSourceConfiguratorTestClass
+{
+public:
+
+  static void TestInstantiation()
+  {
+    // let's create an object of our class
+    mitk::TrackingDeviceSourceConfigurator::Pointer testInstance;
+    mitk::NavigationToolStorage::Pointer emptyStorage = mitk::NavigationToolStorage::New();
+    mitk::TrackingDevice::Pointer dummyDevice = mitk::ClaronTrackingDevice::New();
+    testInstance = mitk::TrackingDeviceSourceConfigurator::New(emptyStorage,dummyDevice);
+    MITK_TEST_CONDITION_REQUIRED(testInstance.IsNotNull(),"Testing instantiation:");
+  }
+
+  static void TestSimpleClaronTrackingDevice()
+  {
+    mitk::TrackingDeviceSourceConfigurator::Pointer testInstance;
+
+    mitk::NavigationToolStorage::Pointer claronStorage = mitk::NavigationToolStorage::New();
+
+    mitk::NavigationTool::Pointer firstTool = mitk::NavigationTool::New();
+    //firstTool
+
+  }
+};
+
+int mitkTrackingDeviceSourceConfiguratorTest(int /* argc */, char* /*argv*/[])
+{
+  MITK_TEST_BEGIN("TrackingDeviceConfigurator");
+
+  mitkTrackingDeviceSourceConfiguratorTestClass::TestInstantiation();
+  
+  MITK_TEST_END();
+}
\ No newline at end of file