diff --git a/dune/common/test/diagonalmatrixtest.cc b/dune/common/test/diagonalmatrixtest.cc
index 0531c8aa9233418a6a7ccfdd0bd42daf4036c064..6f25cd03f0998980967ccb8fe3fddfe0d54d0319 100644
--- a/dune/common/test/diagonalmatrixtest.cc
+++ b/dune/common/test/diagonalmatrixtest.cc
@@ -4,13 +4,14 @@
 #include "config.h"
 #endif
 
-#include <dune/common/diagonalmatrix.hh>
 
 #include <iostream>
 #include <algorithm>
 
-#include <dune/common/fvector.hh>
 #include <dune/common/exceptions.hh>
+#include <dune/common/fvector.hh>
+#include <dune/common/diagonalmatrix.hh>
+#include <dune/common/unused.hh>
 
 #include "checkmatrixinterface.hh"
 
@@ -19,7 +20,7 @@ using namespace Dune;
 template<class K, int n>
 void test_matrix()
 {
-  typedef typename DiagonalMatrix<K,n>::size_type size_type;
+  typedef typename DiagonalMatrix<K,n>::size_type size_type DUNE_UNUSED;
 
   DiagonalMatrix<K,n> A(1);
   FieldVector<K,n> f;
diff --git a/dune/common/test/testdebugallocator.cc b/dune/common/test/testdebugallocator.cc
index 9d21e8c1e54340693ebd471301544d861fd5a5a2..1fd7a357e6b44abfc0133e83b597c1111221f7a7 100644
--- a/dune/common/test/testdebugallocator.cc
+++ b/dune/common/test/testdebugallocator.cc
@@ -91,7 +91,7 @@ void new_delete_tests()
 int main(int, char**)
 {
 #if EXPECTED_SIGNAL
-  auto handler = std::signal(EXPECTED_SIGNAL, std::_Exit);
+  std::signal(EXPECTED_SIGNAL, std::_Exit);
 #endif
 
   basic_tests();