diff --git a/dune/common/test/CMakeLists.txt b/dune/common/test/CMakeLists.txt
index 95c4964b7068f6937912bde46afaeb34e5a6b590..e8a111f62efc28ae082f61b7cf2c225f1aa0bb5b 100644
--- a/dune/common/test/CMakeLists.txt
+++ b/dune/common/test/CMakeLists.txt
@@ -38,8 +38,6 @@ dune_add_test(SOURCES classnametest.cc
 dune_add_test(SOURCES concept.cc
               LINK_LIBRARIES dunecommon)
 
-dune_add_test(SOURCES conversiontest.cc)
-
 dune_add_test(SOURCES diagonalmatrixtest.cc
               LINK_LIBRARIES dunecommon)
 
diff --git a/dune/common/test/Makefile.am b/dune/common/test/Makefile.am
index f8d82279300b000d59c3722a149ae19634e3cb00..4690da4e04e32bc474887d5881da2595ce1e70a4 100644
--- a/dune/common/test/Makefile.am
+++ b/dune/common/test/Makefile.am
@@ -8,7 +8,6 @@ TESTPROGS = \
     calloncetest \
     check_fvector_size \
     classnametest \
-    conversiontest \
     diagonalmatrixtest \
     dynmatrixtest \
     dynvectortest \
diff --git a/dune/common/test/conversiontest.cc b/dune/common/test/conversiontest.cc
deleted file mode 100644
index b87b4b00edb21ebc13fca5a5d2c271ccb3a10f7d..0000000000000000000000000000000000000000
--- a/dune/common/test/conversiontest.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// vi: set et ts=4 sw=2 sts=2:
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <iostream>
-#include <dune/common/typetraits.hh>
-
-int main ()
-{
-  std :: cout << "Conversion from int to double exists? "
-              << Dune::Conversion< int, double > :: exists << std :: endl;
-
-  return 0;
-}
diff --git a/dune/common/typetraits.hh b/dune/common/typetraits.hh
index ff4bace324ac7d715ec0e3f6f8857fc608d56764..00fb4460aec23e31d906a0a37e579fdacf45c681 100644
--- a/dune/common/typetraits.hh
+++ b/dune/common/typetraits.hh
@@ -131,7 +131,7 @@ namespace Dune
        * @brief True if either a conversion from T1 to T2 or vice versa
        * exists.
        */
-      value = Conversion<T1,T2>::exists || Conversion<T2,T1>::exists
+      value = std::is_convertible<T1,T2>::value || std::is_convertible<T2,T1>::value
     };
   };