diff --git a/Applications/CLI/NumericsConfig.h b/Applications/CLI/NumericsConfig.h
index 1a8978149942fb30fb4a851a582b6eae87b8d677..029fa5e324167ec146812ddc5c877882e8a0df57 100644
--- a/Applications/CLI/NumericsConfig.h
+++ b/Applications/CLI/NumericsConfig.h
@@ -38,6 +38,18 @@ namespace detail
 }
 
 #else    // USE_LIS
+#ifdef OGS_USE_EIGEN
+    #include "MathLib/LinAlg/Eigen/EigenVector.h"
+    #include "MathLib/LinAlg/Eigen/EigenMatrix.h"
+    #include "MathLib/LinAlg/Eigen/EigenLinearSolver.h"
+namespace detail
+{
+    using GlobalVectorType = MathLib::EigenVector;
+    using GlobalMatrixType = MathLib::EigenMatrix;
+
+    using LinearSolverType = MathLib::EigenLinearSolver;
+}
+#else   // OGS_USE_EIGEN
     #include "MathLib/LinAlg/Dense/DenseVector.h"
     #include "MathLib/LinAlg/Dense/GlobalDenseMatrix.h"
     #include "MathLib/LinAlg/Solvers/GaussAlgorithm.h"
@@ -51,6 +63,7 @@ namespace detail
 }
 
 #endif    // USE_LIS
+#endif    // OGS_USE_EIGEN
 
 
 //
diff --git a/Tests/AssemblerLib/TestSerialVectorMatrixBuilder.cpp b/Tests/AssemblerLib/TestSerialVectorMatrixBuilder.cpp
index 473705e3599651c37391a1ab338dbf3959f7d8ef..1ecf75b6576d9a304d5d1251717e233cc486eb9e 100644
--- a/Tests/AssemblerLib/TestSerialVectorMatrixBuilder.cpp
+++ b/Tests/AssemblerLib/TestSerialVectorMatrixBuilder.cpp
@@ -102,6 +102,11 @@ REGISTER_TYPED_TEST_CASE_P(AssemblerLibSerialVectorMatrixBuilder,
 #include "MathLib/LinAlg/PETSc/PETScMatrix.h"
 #endif  // USE_PETSC
 
+#ifdef OGS_USE_EIGEN
+#include "MathLib/LinAlg/Eigen/EigenVector.h"
+#include "MathLib/LinAlg/Eigen/EigenMatrix.h"
+#endif  // OGS_USE_EIGEN
+
 typedef ::testing::Types
     < AssemblerLib::SerialVectorMatrixBuilder<
         MathLib::GlobalDenseMatrix<double>, MathLib::DenseVector<double>>
@@ -113,6 +118,10 @@ typedef ::testing::Types
     , AssemblerLib::SerialVectorMatrixBuilder<
         MathLib::PETScMatrix, MathLib::PETScVector>
 #endif  // USE_PETSC
+#ifdef OGS_USE_EIGEN
+    , AssemblerLib::SerialVectorMatrixBuilder<
+        MathLib::EigenMatrix, MathLib::EigenVector>
+#endif  // OGS_USE_EIGEN
     > TestTypes;
 
 INSTANTIATE_TYPED_TEST_CASE_P(templated, AssemblerLibSerialVectorMatrixBuilder,