diff --git a/dune/common/assertandreturn.hh b/dune/common/assertandreturn.hh
index b5613880ca4ef47acd3ef30e599e0e944c5975ac..a08a62c1a1a2d745feffccee82507dbf062de4ce 100644
--- a/dune/common/assertandreturn.hh
+++ b/dune/common/assertandreturn.hh
@@ -5,9 +5,11 @@
 #ifndef DUNE_COMMON_ASSERTANDRETURN_HH
 #define DUNE_COMMON_ASSERTANDRETURN_HH
 
+#ifndef DUNE_DISABLE_DEPRECATION_WARNING_ASSERT_AND_RETURN
 #warning "The file assertandreturn.hh is deprecated. Since c++14 constexpr functions allow more \
 than a single return statement and thus this utility is useless. Will be removed after \
 Dune 2.10 release."
+#endif // DUNE_DISABLE_DEPRECATION_WARNING_ASSERT_AND_RETURN
 
 #include <cassert>
 
diff --git a/dune/common/hybridutilities.hh b/dune/common/hybridutilities.hh
index 3f960556bf040d436fddc7d3eb33af8e4974f8b0..052418e8110b58fbf1f1fda24250f792918428d1 100644
--- a/dune/common/hybridutilities.hh
+++ b/dune/common/hybridutilities.hh
@@ -12,7 +12,6 @@
 #include <dune/common/typeutilities.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/indices.hh>
-#include <dune/common/assertandreturn.hh>
 #include <dune/common/rangeutilities.hh>
 
 
diff --git a/dune/common/test/assertandreturntest.cc b/dune/common/test/assertandreturntest.cc
index 5c1a806655f44f626da598be22a279d8e4f1ba32..13cd6cf65c878d50dd3bbf154b482aaa075e4548 100644
--- a/dune/common/test/assertandreturntest.cc
+++ b/dune/common/test/assertandreturntest.cc
@@ -12,7 +12,11 @@
 #endif
 
 #include <cassert>
+
+#define DUNE_DISABLE_DEPRECATION_WARNING_ASSERT_AND_RETURN
 #include <dune/common/assertandreturn.hh>
+#undef DUNE_DISABLE_DEPRECATION_WARNING_ASSERT_AND_RETURN
+
 #include <dune/common/exceptions.hh>
 #include <dune/common/parallel/mpihelper.hh>