diff --git a/ebos/ebos_plain.cc b/ebos/ebos_plain.cc
index 089c943f6..d2dd983c1 100644
--- a/ebos/ebos_plain.cc
+++ b/ebos/ebos_plain.cc
@@ -28,6 +28,7 @@
 #include "config.h"
 
 #include "eclproblem.hh"
+#include "eclwellmanager.hh"
 
 #include <opm/models/utils/start.hh>
 
@@ -39,6 +40,11 @@ struct EbosPlainTypeTag {
 };
 }
 
+template<class TypeTag>
+struct EclWellModel<TypeTag, TTag::EbosPlainTypeTag> {
+    using type = EclWellManager<TypeTag>;
+};
+
 } // namespace Opm::Properties
 
 int main(int argc, char **argv)
diff --git a/ebos/eclproblem.hh b/ebos/eclproblem.hh
index 91bd5baca..3b9f303ad 100644
--- a/ebos/eclproblem.hh
+++ b/ebos/eclproblem.hh
@@ -53,7 +53,6 @@
 #include "eclcpgridvanguard.hh"
 #endif
 
-#include "eclwellmanager.hh"
 #include "eclequilinitializer.hh"
 #include "eclwriter.hh"
 #include "ecloutputblackoilmodule.hh"
@@ -307,12 +306,6 @@ struct EclAquiferModel<TypeTag, TTag::EclBaseProblem> {
     using type = EclBaseAquiferModel<TypeTag>;
 };
 
-// use the built-in proof of concept well model by default
-template<class TypeTag>
-struct EclWellModel<TypeTag, TTag::EclBaseProblem> {
-    using type = EclWellManager<TypeTag>;
-};
-
 // Enable aquifers by default in experimental mode
 template<class TypeTag>
 struct EclEnableAquifers<TypeTag, TTag::EclBaseProblem> {
diff --git a/opm/simulators/wells/WellInterface_impl.hpp b/opm/simulators/wells/WellInterface_impl.hpp
index 54861aebe..18ce7033f 100644
--- a/opm/simulators/wells/WellInterface_impl.hpp
+++ b/opm/simulators/wells/WellInterface_impl.hpp
@@ -21,6 +21,7 @@
 
 #include <opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.hpp>
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/wells/GroupState.hpp>
 #include <opm/simulators/wells/TargetCalculator.hpp>
 
 namespace Opm
diff --git a/tests/test_ecl_output.cc b/tests/test_ecl_output.cc
index 3e9095be7..b0dcaf59c 100644
--- a/tests/test_ecl_output.cc
+++ b/tests/test_ecl_output.cc
@@ -26,6 +26,7 @@
 
 #include <ebos/equil/equilibrationhelpers.hh>
 #include <ebos/eclproblem.hh>
+#include <ebos/eclwellmanager.hh>
 #include <opm/models/utils/start.hh>
 
 #include <opm/grid/UnstructuredGrid.h>
@@ -67,19 +68,27 @@
 
 namespace Opm::Properties {
 namespace TTag {
+
 struct TestEclOutputTypeTag {
     using InheritsFrom = std::tuple<EclBaseProblem, BlackOilModel>;
 };
 }
+
 template<class TypeTag>
 struct EnableGravity<TypeTag, TTag::TestEclOutputTypeTag> {
     static constexpr bool value = false;
 };
+
 template<class TypeTag>
 struct EnableAsyncEclOutput<TypeTag, TTag::TestEclOutputTypeTag> {
     static constexpr bool value = false;
 };
 
+template<class TypeTag>
+struct EclWellModel<TypeTag, TTag::TestEclOutputTypeTag> {
+    using type = EclWellManager<TypeTag>;
+};
+
 } // namespace Opm::Properties
 
 namespace {
diff --git a/tests/test_equil.cc b/tests/test_equil.cc
index 1dc36eff1..d4e454e69 100644
--- a/tests/test_equil.cc
+++ b/tests/test_equil.cc
@@ -26,6 +26,7 @@
 
 #include <ebos/equil/equilibrationhelpers.hh>
 #include <ebos/eclproblem.hh>
+#include <ebos/eclwellmanager.hh>
 #include <opm/models/utils/start.hh>
 
 #include <opm/grid/UnstructuredGrid.h>
@@ -64,10 +65,17 @@
 
 namespace Opm::Properties {
 namespace TTag {
+
 struct TestEquilTypeTag {
     using InheritsFrom = std::tuple<EclBaseProblem, BlackOilModel>;
 };
 }
+
+template<class TypeTag>
+struct EclWellModel<TypeTag, TTag::TestEquilTypeTag> {
+    using type = EclWellManager<TypeTag>;
+};
+
 } // namespace Opm::Properties
 
 template <class TypeTag>