diff --git a/server/core/test/test_dcb.cc b/server/core/test/test_dcb.cc
index 81aef9c02..fc8abbf92 100644
--- a/server/core/test/test_dcb.cc
+++ b/server/core/test/test_dcb.cc
@@ -53,6 +53,7 @@ static int test1()
     MXS_CONFIG_PARAMETER parameters;
     parameters.set("max_retry_interval", "10s");
     parameters.set("connection_timeout", "10s");
+    parameters.set("net_write_timeout", "10s");
     auto service = service_alloc("service", "readconnroute", &parameters);
 
     MXS_CONFIG_PARAMETER listener_params;
diff --git a/server/core/test/test_poll.cc b/server/core/test/test_poll.cc
index 4fd6574c4..ce838fd6f 100644
--- a/server/core/test/test_poll.cc
+++ b/server/core/test/test_poll.cc
@@ -59,6 +59,7 @@ static int test1()
     MXS_CONFIG_PARAMETER parameters;
     parameters.set(CN_MAX_RETRY_INTERVAL, "10s");
     parameters.set(CN_CONNECTION_TIMEOUT, "10s");
+    parameters.set(CN_NET_WRITE_TIMEOUT, "10s");
     auto service = service_alloc("service", "readconnroute", &parameters);
 
     MXS_CONFIG_PARAMETER listener_params;
diff --git a/server/core/test/test_service.cc b/server/core/test/test_service.cc
index 573cb04aa..91c67b25a 100644
--- a/server/core/test/test_service.cc
+++ b/server/core/test/test_service.cc
@@ -64,7 +64,7 @@ static int test1()
     MXS_CONFIG_PARAMETER parameters;
     parameters.set(CN_MAX_RETRY_INTERVAL, "10s");
     parameters.set(CN_CONNECTION_TIMEOUT, "10s");
-
+    parameters.set(CN_NET_WRITE_TIMEOUT, "10s");
     /* Service tests */
     fprintf(stderr,
             "testservice : creating service called MyService with router nonexistent");
diff --git a/server/modules/filter/cache/test/test_cacheoptions.cc b/server/modules/filter/cache/test/test_cacheoptions.cc
index fa525d830..99fe400c9 100644
--- a/server/modules/filter/cache/test/test_cacheoptions.cc
+++ b/server/modules/filter/cache/test/test_cacheoptions.cc
@@ -293,6 +293,7 @@ int test(FilterModule::Instance& filter_instance, const TEST_CASE& tc)
     MXS_CONFIG_PARAMETER parameters;
     parameters.set("max_retry_interval", "10s");
     parameters.set("connection_timeout", "10s");
+    parameters.set(CN_NET_WRITE_TIMEOUT, "10s");
 
     auto service = service_alloc("service", "readconnroute", &parameters);
 
diff --git a/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc b/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
index a89c3623d..f92a76784 100644
--- a/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
@@ -771,6 +771,7 @@ int test(FilterModule::Instance& filter_instance, const FW_TEST& t)
             MXS_CONFIG_PARAMETER parameters;
             parameters.set("max_retry_interval", "10s");
             parameters.set("connection_timeout", "10s");
+            parameters.set(CN_NET_WRITE_TIMEOUT, "10s");
             auto service = service_alloc("service", "readconnroute", &parameters);
 
             static int port = 3306;
diff --git a/server/modules/routing/binlogrouter/test/testbinlog.cc b/server/modules/routing/binlogrouter/test/testbinlog.cc
index c61de7b64..9ce4a8b7b 100644
--- a/server/modules/routing/binlogrouter/test/testbinlog.cc
+++ b/server/modules/routing/binlogrouter/test/testbinlog.cc
@@ -115,6 +115,7 @@ int main(int argc, char** argv)
     config_add_defaults(&ctx, get_module("binlogrouter", MODULE_ROUTER)->parameters);
     ctx.m_parameters.set(CN_MAX_RETRY_INTERVAL, "10s");
     ctx.m_parameters.set(CN_CONNECTION_TIMEOUT, "10s");
+    ctx.m_parameters.set(CN_NET_WRITE_TIMEOUT, "10s");
 
     const char* options = "server_id=3,heartbeat=200,binlogdir=/tmp/my_dir,"
                           "transaction_safety=1,master_version=5.6.99-common,"