diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 879d20d39343e7b67cd5319a128bde77b360433c..e33ec88bb022ae5284c79e24992b187997fe24c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,27 +1,39 @@
 ---
+before_script:
+  - source ~/toolchain
+  - export CMAKE_FLAGS="-DCMAKE_C_COMPILER='$CC' -DCMAKE_CXX_COMPILER='$CXX'"
+
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
 debian:10 gcc-8-17:
   image: registry.dune-project.org/docker/ci/dune:2.6-debian-10-gcc-8-17
   script:
-  - duneci-standard-test
+  - dunecontrol --current all
+  - dunecontrol --current make build_tests
+  - dunecontrol --current make test
   - dunecontrol --current make examples
 
 debian:10 clang-6-libcpp-17:
   image: registry.dune-project.org/docker/ci/dune:2.6-debian-10-clang-6-libcpp-17
   script:
-  - duneci-standard-test
+  - dunecontrol --current all
+  - dunecontrol --current make build_tests
+  - dunecontrol --current make test
   - dunecontrol --current make examples
 
 debian:9 gcc-6-14:
   image: registry.dune-project.org/docker/ci/dune:2.6-debian-9-gcc-6-14
   script:
-  - duneci-standard-test
+  - dunecontrol --current all
+  - dunecontrol --current make build_tests
+  - dunecontrol --current make test
   - dunecontrol --current make examples
 
 ubuntu:18.04 clang-6-17:
   image: registry.dune-project.org/docker/ci/dune:2.6-ubuntu-18.04-clang-6-17
   script:
-  - duneci-standard-test
+  - dunecontrol --current all
+  - dunecontrol --current make build_tests
+  - dunecontrol --current make test
   - dunecontrol --current make examples
diff --git a/src/amdis/linear_algebra/istl/ISTL_Preconditioner.hpp b/src/amdis/linear_algebra/istl/ISTL_Preconditioner.hpp
index 4a653fa796949ba28b3e3511da3628f4aed5cd1f..74280924a0b5929bcedb936ec75843ee2418fff1 100644
--- a/src/amdis/linear_algebra/istl/ISTL_Preconditioner.hpp
+++ b/src/amdis/linear_algebra/istl/ISTL_Preconditioner.hpp
@@ -9,6 +9,7 @@ namespace AMDiS
   template <class Matrix, class VectorX, class VectorB>
   struct ISTLPreconInterface
   {
+    virtual ~ISTLPreconInterface() = default;
     using PreconBase = Dune::Preconditioner<VectorX, VectorB>;
     virtual std::unique_ptr<PreconBase> create(Matrix const& matrix) const = 0;
   };
diff --git a/src/amdis/linear_algebra/mtl/UmfpackRunner.hpp b/src/amdis/linear_algebra/mtl/UmfpackRunner.hpp
index f3d5351174b1e744ddbf7437e4542c713755b16d..59576c9723621d5f32aed865d8d9e2cbc3777d3b 100644
--- a/src/amdis/linear_algebra/mtl/UmfpackRunner.hpp
+++ b/src/amdis/linear_algebra/mtl/UmfpackRunner.hpp
@@ -46,9 +46,6 @@ namespace AMDiS
       Parameters::get(prefix + "->alloc init", allocInit_);
     }
 
-    /// Destructor
-    ~UmfpackRunnerBase() = default;
-
     /// Implementation of \ref RunnerBase::solve()
     virtual int solve(Matrix const& A, Vector& x, Vector const& b,
                       SolverInfo& solverInfo) override