diff --git a/opm/simulators/wells/WellInterfaceFluidSystem.cpp b/opm/simulators/wells/WellInterfaceFluidSystem.cpp
index f7faff4a3..36f468d2f 100644
--- a/opm/simulators/wells/WellInterfaceFluidSystem.cpp
+++ b/opm/simulators/wells/WellInterfaceFluidSystem.cpp
@@ -34,7 +34,6 @@
 #include <opm/simulators/wells/TargetCalculator.hpp>
 #include <opm/simulators/wells/WellGroupHelpers.hpp>
 #include <opm/simulators/wells/WellState.hpp>
-#include <opm/simulators/wells/WellTest.hpp>
 
 #include <cassert>
 #include <cmath>
@@ -503,26 +502,6 @@ checkConstraints(WellState& well_state,
     }
 }
 
-template<typename FluidSystem>
-void
-WellInterfaceFluidSystem<FluidSystem>::
-updateWellTestState(const SingleWellState& ws,
-                    const double& simulationTime,
-                    const bool& writeMessageToOPMLog,
-                    WellTestState& wellTestState,
-                    DeferredLogger& deferred_logger) const
-{
-    // updating well test state based on Economic limits for operable wells
-    if (this->isOperableAndSolvable()) {
-        WellTest(*this).updateWellTestStateEconomic(ws, simulationTime, writeMessageToOPMLog, wellTestState, deferred_logger);
-    } else {
-        // updating well test state based on physical (THP/BHP) limits.
-        WellTest(*this).updateWellTestStatePhysical(simulationTime, writeMessageToOPMLog, wellTestState, deferred_logger);
-    }
-
-    // TODO: well can be shut/closed due to other reasons
-}
-
 template<typename FluidSystem>
 int
 WellInterfaceFluidSystem<FluidSystem>::
diff --git a/opm/simulators/wells/WellInterfaceFluidSystem.hpp b/opm/simulators/wells/WellInterfaceFluidSystem.hpp
index 8a8b8a3bc..26dbfd73c 100644
--- a/opm/simulators/wells/WellInterfaceFluidSystem.hpp
+++ b/opm/simulators/wells/WellInterfaceFluidSystem.hpp
@@ -52,12 +52,6 @@ protected:
     static constexpr int INVALIDCOMPLETION = std::numeric_limits<int>::max();
 
 public:
-    void updateWellTestState(const SingleWellState& ws,
-                             const double& simulationTime,
-                             const bool& writeMessageToOPMLog,
-                             WellTestState& wellTestState,
-                             DeferredLogger& deferred_logger) const;
-
     int flowPhaseToEbosPhaseIdx(const int phaseIdx) const;
 
     static constexpr int Water = BlackoilPhases::Aqua;
diff --git a/opm/simulators/wells/WellInterfaceGeneric.cpp b/opm/simulators/wells/WellInterfaceGeneric.cpp
index ea15573f8..a297cd116 100644
--- a/opm/simulators/wells/WellInterfaceGeneric.cpp
+++ b/opm/simulators/wells/WellInterfaceGeneric.cpp
@@ -27,10 +27,11 @@
 #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
 #include <opm/simulators/wells/PerforationData.hpp>
 #include <opm/simulators/wells/ParallelWellInfo.hpp>
-#include <opm/simulators/wells/VFPProperties.hpp>
-#include <opm/simulators/wells/WellState.hpp>
-#include <opm/simulators/wells/WellHelpers.hpp>
 #include <opm/simulators/wells/VFPHelpers.hpp>
+#include <opm/simulators/wells/VFPProperties.hpp>
+#include <opm/simulators/wells/WellHelpers.hpp>
+#include <opm/simulators/wells/WellState.hpp>
+#include <opm/simulators/wells/WellTest.hpp>
 #include <cassert>
 #include <cmath>
 #include <cstddef>
@@ -215,6 +216,24 @@ double WellInterfaceGeneric::mostStrictBhpFromBhpLimits(const SummaryState& summ
     return 0.0;
 }
 
+void WellInterfaceGeneric::updateWellTestState(const SingleWellState& ws,
+                                               const double& simulationTime,
+                                               const bool& writeMessageToOPMLog,
+                                               WellTestState& wellTestState,
+                                               DeferredLogger& deferred_logger) const
+{
+    // updating well test state based on Economic limits for operable wells
+    if (this->isOperableAndSolvable()) {
+        WellTest(*this).updateWellTestStateEconomic(ws, simulationTime, writeMessageToOPMLog, wellTestState, deferred_logger);
+    } else {
+        // updating well test state based on physical (THP/BHP) limits.
+        WellTest(*this).updateWellTestStatePhysical(simulationTime, writeMessageToOPMLog, wellTestState, deferred_logger);
+    }
+
+    // TODO: well can be shut/closed due to other reasons
+}
+
+
 double WellInterfaceGeneric::getTHPConstraint(const SummaryState& summaryState) const
 {
     if (dynamic_thp_limit_) {
diff --git a/opm/simulators/wells/WellInterfaceGeneric.hpp b/opm/simulators/wells/WellInterfaceGeneric.hpp
index ce9199e01..06825526a 100644
--- a/opm/simulators/wells/WellInterfaceGeneric.hpp
+++ b/opm/simulators/wells/WellInterfaceGeneric.hpp
@@ -197,7 +197,11 @@ public:
                                                          DeferredLogger& deferred_logger
                                                          ) const;
 
-
+    void updateWellTestState(const SingleWellState& ws,
+                             const double& simulationTime,
+                             const bool& writeMessageToOPMLog,
+                             WellTestState& wellTestState,
+                             DeferredLogger& deferred_logger) const;
 
 protected:
     bool getAllowCrossFlow() const;
diff --git a/opm/simulators/wells/WellTest.cpp b/opm/simulators/wells/WellTest.cpp
index 1c0549bef..cd1a3d646 100644
--- a/opm/simulators/wells/WellTest.cpp
+++ b/opm/simulators/wells/WellTest.cpp
@@ -455,5 +455,4 @@ void WellTest::updateWellTestStatePhysical(const double simulation_time,
     }
 }
 
-
 } // namespace Opm