diff --git a/Modules/IGT/Testing/mitkTrackingToolTest.cpp b/Modules/IGT/Testing/mitkTrackingToolTest.cpp
index 38657eee1e..65f6757e6d 100644
--- a/Modules/IGT/Testing/mitkTrackingToolTest.cpp
+++ b/Modules/IGT/Testing/mitkTrackingToolTest.cpp
@@ -1,66 +1,63 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
+// Testing
+#include "mitkTestFixture.h"
 #include "mitkTestingMacros.h"
+
 #include "mitkTrackingTool.h"
-#include "mitkTrackingTypes.h"
 
-#include "mitkCommon.h"
+// VTK includes
+#include <vtkDebugLeaks.h>
 
-#include <itkObject.h>
-#include <itkObjectFactory.h>
-/**
-* Create new class and derive it from TrackingDevice
-*/
-class TrackingToolTestClass : public mitk::TrackingTool
+class mitkTrackingToolTestSuite : public mitk::TestFixture
 {
-public:
+  CPPUNIT_TEST_SUITE(mitkTrackingToolTestSuite);
 
-  mitkClassMacro(TrackingToolTestClass, mitk::TrackingTool);
-  itkFactorylessNewMacro(Self)
-  itkCloneMacro(Self)
+  MITK_TEST(GetToolName_Default_ReturnsEmptyString);
+  MITK_TEST(GetErrorMessage_Default_ReturnsEmptyString);
 
-  void GetPosition(mitk::Point3D & /*position*/) const override {};
-  void GetOrientation(mitk::Quaternion&  /*orientation*/) const override {};
-  void SetToolTip(mitk::Point3D /*toolTipPosition*/, mitk::Quaternion /*orientation*/, mitk::ScalarType /*eps*/) override {};
-  bool Enable() override {return true;}
-  bool Disable() override {return true;}
-  bool IsEnabled() const override {return true;}
-  bool IsDataValid() const override {return true;}
-  float GetTrackingError() const override {return 0.0;}
+  CPPUNIT_TEST_SUITE_END();
 
-};
+private:
+  mitk::TrackingTool::Pointer m_TrackingTool;
 
-/**
-* This function is testing the Class TrackingDevice. For most tests we would need the MicronTracker hardware, so only a few
-* simple tests, which can run without the hardware are implemented yet (2009, January, 23rd). As soon as there is a working
-* concept to test the tracking classes which are very close to the hardware on all systems more tests are needed here.
-*/
-int mitkTrackingToolTest(int /* argc */, char* /*argv*/[])
-{
-  MITK_TEST_BEGIN("TrackingTool");
-
-  // Test instantiation of TrackingTool
-  TrackingToolTestClass::Pointer trackingToolTestClass = TrackingToolTestClass::New();
-  MITK_TEST_CONDITION(trackingToolTestClass.IsNotNull(),"Test instatiation");
+public:
+  void setUp() override
+  {
+    m_TrackingTool = mitk::TrackingTool::New();
+  }
+
+  void tearDown() override
+  {
+    m_TrackingTool = nullptr;
+  }
+
+  void GetToolName_Default_ReturnsEmptyString()
+  {
+    MITK_INFO << "GetToolName_Default_ReturnsEmptyString";
+    CPPUNIT_ASSERT_MESSAGE("Tool name should be empty", !strcmp(m_TrackingTool->GetToolName(), ""));
+  }
+
+  void GetErrorMessage_Default_ReturnsEmptyString()
+  {
+    MITK_INFO << "GetErrorMessage_Default_ReturnsEmptyString";
+    CPPUNIT_ASSERT_MESSAGE("Error message should be empty", !strcmp(m_TrackingTool->GetErrorMessage(), ""));
+  }
 
-  // Test method GetToolName()
-  MITK_TEST_CONDITION(!strcmp(trackingToolTestClass->GetToolName(),""),"Tool name should be empty");
-  // Test method GetErrorMessage()
-  MITK_TEST_CONDITION(!strcmp(trackingToolTestClass->GetErrorMessage(),""),"Error message should be empty");
+};
 
-  MITK_TEST_END();
-}
+MITK_TEST_SUITE_REGISTRATION(mitkTrackingTool)