diff --git a/tests/test_auth.c b/tests/test_auth.c
index e57405b..87f6e89 100644
--- a/tests/test_auth.c
+++ b/tests/test_auth.c
@@ -340,6 +340,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     lyd_free_all(tree);
 
     return 0;
diff --git a/tests/test_ch.c b/tests/test_ch.c
index 13ab75e..1218d2c 100644
--- a/tests/test_ch.c
+++ b/tests/test_ch.c
@@ -225,6 +225,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     return 0;
 }
 
@@ -425,6 +429,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     return 0;
 }
 
diff --git a/tests/test_config_new.c b/tests/test_config_new.c
index c484c86..72dda36 100644
--- a/tests/test_config_new.c
+++ b/tests/test_config_new.c
@@ -172,6 +172,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     lyd_free_all(tree);
 
     return 0;
diff --git a/tests/test_crl.c b/tests/test_crl.c
index 7a9cf44..253f45c 100644
--- a/tests/test_crl.c
+++ b/tests/test_crl.c
@@ -188,6 +188,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     lyd_free_all(tree);
 
     return 0;
diff --git a/tests/test_ec.c b/tests/test_ec.c
index 669d93c..43d513f 100644
--- a/tests/test_ec.c
+++ b/tests/test_ec.c
@@ -236,6 +236,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     lyd_free_all(tree);
 
     return 0;
diff --git a/tests/test_ed25519.c b/tests/test_ed25519.c
index da6df76..b381c6a 100644
--- a/tests/test_ed25519.c
+++ b/tests/test_ed25519.c
@@ -167,6 +167,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     lyd_free_all(tree);
 
     return 0;
diff --git a/tests/test_endpt_share_clients.c b/tests/test_endpt_share_clients.c
index b6ccb1b..f9284fe 100644
--- a/tests/test_endpt_share_clients.c
+++ b/tests/test_endpt_share_clients.c
@@ -220,6 +220,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     lyd_free_all(tree);
 
     return 0;
@@ -292,6 +296,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     lyd_free_all(tree);
 
     return 0;
diff --git a/tests/test_ks_ts.c b/tests/test_ks_ts.c
index cd8cd96..159b6cf 100644
--- a/tests/test_ks_ts.c
+++ b/tests/test_ks_ts.c
@@ -160,6 +160,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     lyd_free_all(tree);
 
     return 0;
@@ -284,6 +288,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     lyd_free_all(tree);
 
     return 0;
diff --git a/tests/test_replace.c b/tests/test_replace.c
index ba09984..7a61cee 100644
--- a/tests/test_replace.c
+++ b/tests/test_replace.c
@@ -265,6 +265,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     lyd_free_all(old_tree);
     lyd_free_all(new_tree);
 
diff --git a/tests/test_runtime_changes.c b/tests/test_runtime_changes.c
index be28f4a..a7cd45d 100644
--- a/tests/test_runtime_changes.c
+++ b/tests/test_runtime_changes.c
@@ -489,6 +489,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     return 0;
 }
 
diff --git a/tests/test_tls.c b/tests/test_tls.c
index ed0966b..dc5b502 100644
--- a/tests/test_tls.c
+++ b/tests/test_tls.c
@@ -174,6 +174,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     lyd_free_all(tree);
 
     return 0;
diff --git a/tests/test_two_channels.c b/tests/test_two_channels.c
index d551014..38597c0 100644
--- a/tests/test_two_channels.c
+++ b/tests/test_two_channels.c
@@ -172,6 +172,10 @@
     ret = nc_server_init();
     assert_int_equal(ret, 0);
 
+    /* initialize client */
+    ret = nc_client_init();
+    assert_int_equal(ret, 0);
+
     lyd_free_all(tree);
 
     return 0;