diff --git a/src/libraries/turtle/mock.hpp b/src/libraries/turtle/mock.hpp
index f807290..6ff37d8 100644
--- a/src/libraries/turtle/mock.hpp
+++ b/src/libraries/turtle/mock.hpp
@@ -49,10 +49,7 @@ namespace detail
     {};
 
     template< typename T >
-    struct base;
-
-    template< typename T >
-    struct base< void( T ) > : T
+    struct base
     {
         typedef T base_type;
     };
@@ -81,7 +78,7 @@ namespace detail
 }
 
 #define MOCK_BASE_CLASS(T, I) \
-    struct T : mock::detail::base< void( I ) >, mock::object
+    struct T : I, mock::object, mock::detail::base< I >
 #define MOCK_CLASS(T) \
     struct T : mock::object
 #define MOCK_FUNCTOR(f, S) \
diff --git a/src/tests/turtle_test/mock_test.cpp b/src/tests/turtle_test/mock_test.cpp
index 38a3460..3a63fe5 100644
--- a/src/tests/turtle_test/mock_test.cpp
+++ b/src/tests/turtle_test/mock_test.cpp
@@ -319,20 +319,3 @@ BOOST_AUTO_TEST_CASE( mock_static_function_is_named )
 {
     BOOST_CHECK_EQUAL( "static_function_class::mock_static_function", to_string( MOCK_MOCKER( static_function_class::mock_static_function ) ) );
 }
-
-namespace
-{
-    template< typename T1, typename T2 >
-    struct base_template_class
-    {};
-    MOCK_BASE_CLASS( mock_instanciated_template_class, (base_template_class< int, int >) )
-    {};
-    template< typename T >
-    MOCK_BASE_CLASS( mock_template_class, (base_template_class< T, T >) )
-    {};
-}
-
-BOOST_AUTO_TEST_CASE( mock_template_class_can_be_instanciated )
-{
-    mock_template_class< int > c;
-}