diff --git a/test/test_CMSSMMassWInput_spectrum.cpp b/test/test_CMSSMMassWInput_spectrum.cpp
index 240e19709..bbe2a4cad 100644
--- a/test/test_CMSSMMassWInput_spectrum.cpp
+++ b/test/test_CMSSMMassWInput_spectrum.cpp
@@ -19,6 +19,7 @@
 #include "two_scale_running_precision.hpp"
 #include "CMSSMMassWInput_two_scale_model.hpp"
 #include "CMSSMMassWInput_input_parameters.hpp"
+#include "CMSSMMassWInput_two_scale_ewsb_solver.hpp"
 #include "CMSSMMassWInput_two_scale_high_scale_constraint.hpp"
 #include "CMSSMMassWInput_two_scale_susy_scale_constraint.hpp"
 #include "CMSSMMassWInput_two_scale_low_scale_constraint.hpp"
@@ -553,6 +554,9 @@ class CMSSMMassWInput_tester {
 
       const double precision_goal = softsusy::TOLERANCE;
 
+      CMSSMMassWInput_ewsb_solver<Two_scale> ewsb_solver;
+      mssm.set_ewsb_solver(&ewsb_solver);
+
       mssm.clear();
       mssm.set_loops(2);
       mssm.set_thresholds(2);
diff --git a/test/test_NMSSM_ewsb.cpp b/test/test_NMSSM_ewsb.cpp
index 518a7244b..06e6f0055 100644
--- a/test/test_NMSSM_ewsb.cpp
+++ b/test/test_NMSSM_ewsb.cpp
@@ -10,6 +10,7 @@
 #include "wrappers.hpp"
 #include "ew_input.hpp"
 #include "nmssmsoftsusy.h"
+#include "NMSSM_two_scale_ewsb_solver.hpp"
 #include "NMSSM_two_scale_model.hpp"
 
 using namespace flexiblesusy;
@@ -23,6 +24,9 @@ BOOST_AUTO_TEST_CASE( test_NMSSM_ewsb_tree_level )
    const double precision = 1.0e-5;
    setup_NMSSM(m, s, input);
 
+   NMSSM_ewsb_solver<Two_scale> ewsb_solver;
+   m.set_ewsb_solver(&ewsb_solver);
+
    // initial guess
    m.set_Kappa(0.1);
    m.set_vS(5000.);
@@ -120,6 +124,9 @@ BOOST_AUTO_TEST_CASE( test_NMSSM_one_loop_ewsb )
    const double precision = 1.0e-5;
    setup_NMSSM_const(m, s, input);
 
+   NMSSM_ewsb_solver<Two_scale> ewsb_solver;
+   m.set_ewsb_solver(&ewsb_solver);
+
    // initial guess
    m.set_Kappa(0.1);
    m.set_vS(5000.);
@@ -239,6 +246,9 @@ BOOST_AUTO_TEST_CASE( test_NMSSM_two_loop_ewsb )
    const double precision = 1.0e-5;
    setup_NMSSM_const(m, s, input);
 
+   NMSSM_ewsb_solver<Two_scale> ewsb_solver;
+   m.set_ewsb_solver(&ewsb_solver);
+
    // initial guess
    m.set_Kappa(0.1);
    m.set_vS(5000.);
diff --git a/test/test_NMSSM_initial_guesser.cpp b/test/test_NMSSM_initial_guesser.cpp
index 31487956c..425c326b3 100644
--- a/test/test_NMSSM_initial_guesser.cpp
+++ b/test/test_NMSSM_initial_guesser.cpp
@@ -6,6 +6,7 @@
 #include "test_legacy.hpp"
 #include "test_NMSSM.hpp"
 
+#include "NMSSM_two_scale_ewsb_solver.hpp"
 #include "NMSSM_two_scale_model.hpp"
 #include "NMSSM_two_scale_initial_guesser.hpp"
 #include "SoftsusyNMSSM_parameter_point.hpp"
@@ -24,6 +25,9 @@ BOOST_AUTO_TEST_CASE( test_initial_guess )
    m.set_thresholds(2);
    SoftsusyNMSSM<Two_scale> snmssm;
 
+   NMSSM_ewsb_solver<Two_scale> ewsb_solver;
+   m.set_ewsb_solver(&ewsb_solver);
+
    // create NMSSM initial guesser
    NMSSM_input_parameters input;
    input.m0 = 250.; // avoids tree-level tachyons
diff --git a/test/test_NMSSM_one_loop_spectrum.cpp b/test/test_NMSSM_one_loop_spectrum.cpp
index d2e4e91a1..c598c4587 100644
--- a/test/test_NMSSM_one_loop_spectrum.cpp
+++ b/test/test_NMSSM_one_loop_spectrum.cpp
@@ -8,6 +8,7 @@
 #include "wrappers.hpp"
 #include "conversion.hpp"
 #include "nmssmsoftsusy.h"
+#include "NMSSM_two_scale_ewsb_solver.hpp"
 #include "NMSSM_two_scale_model.hpp"
 
 using namespace flexiblesusy;
@@ -93,6 +94,9 @@ BOOST_AUTO_TEST_CASE( test_NMSSM_pole_masses )
    NmssmSoftsusy s;
    setup_NMSSM_const(m, s, input);
 
+   NMSSM_ewsb_solver<Two_scale> ewsb_solver;
+   m.set_ewsb_solver(&ewsb_solver);
+
    ensure_tree_level_ewsb(m, s, input);
 
    softsusy::numHiggsMassLoops = 1;
diff --git a/test/test_NMSSM_self_energies.cpp b/test/test_NMSSM_self_energies.cpp
index 90a305f84..a6ed406c3 100644
--- a/test/test_NMSSM_self_energies.cpp
+++ b/test/test_NMSSM_self_energies.cpp
@@ -8,6 +8,7 @@
 #include "wrappers.hpp"
 #include "conversion.hpp"
 #include "nmssmsoftsusy.h"
+#include "NMSSM_two_scale_ewsb_solver.hpp"
 #include "NMSSM_two_scale_model.hpp"
 
 using namespace flexiblesusy;
@@ -28,6 +29,9 @@ BOOST_AUTO_TEST_CASE( test_NMSSM_self_energy_neutral_higgs )
    setup_NMSSM_const(m, s, input);
    m.do_force_output(true);
 
+   NMSSM_ewsb_solver<Two_scale> ewsb_solver;
+   m.set_ewsb_solver(&ewsb_solver);
+
    // initial guess
    m.set_Kappa(0.1);
    m.set_vS(5000.);
diff --git a/test/test_NMSSM_spectrum.cpp b/test/test_NMSSM_spectrum.cpp
index c61fc8e49..96a545da4 100644
--- a/test/test_NMSSM_spectrum.cpp
+++ b/test/test_NMSSM_spectrum.cpp
@@ -14,6 +14,7 @@
 #include "conversion.hpp"
 #include "two_scale_solver.hpp"
 #include "two_scale_running_precision.hpp"
+#include "NMSSM_two_scale_ewsb_solver.hpp"
 #include "NMSSM_two_scale_model.hpp"
 #include "NMSSM_input_parameters.hpp"
 #include "NMSSM_two_scale_high_scale_constraint.hpp"
@@ -136,6 +137,9 @@ class NMSSM_tester {
    void test(const NMSSM_input_parameters& pp, const QedQcd& qedqcd = QedQcd()) {
       setup_default_constaints(pp, qedqcd);
 
+      NMSSM_ewsb_solver<Two_scale> ewsb_solver;
+      mssm.set_ewsb_solver(&ewsb_solver);
+
       mssm.clear();
       mssm.set_loops(2);
       mssm.set_thresholds(2);
diff --git a/test/test_NMSSM_susy_scale_constraint.cpp b/test/test_NMSSM_susy_scale_constraint.cpp
index 84c586b44..a4f6e9431 100644
--- a/test/test_NMSSM_susy_scale_constraint.cpp
+++ b/test/test_NMSSM_susy_scale_constraint.cpp
@@ -11,6 +11,7 @@
 #include "conversion.hpp"
 #include "ew_input.hpp"
 #include "nmssmsoftsusy.h"
+#include "NMSSM_two_scale_ewsb_solver.hpp"
 #include "NMSSM_two_scale_model.hpp"
 #include "NMSSM_two_scale_susy_scale_constraint.hpp"
 
@@ -28,6 +29,9 @@ BOOST_AUTO_TEST_CASE( test_susy_scale_constraint )
    NmssmSoftsusy s;
    setup_NMSSM(m, s, input);
 
+   NMSSM_ewsb_solver<Two_scale> ewsb_solver;
+   m.set_ewsb_solver(&ewsb_solver);
+
    // initial guess
    m.set_Kappa(0.1);
    m.set_vS(5000.);