diff --git a/libipm/libipm.c b/libipm/libipm.c
index 80c13062..aadb3687 100644
--- a/libipm/libipm.c
+++ b/libipm/libipm.c
@@ -86,6 +86,8 @@ libipm_init_trans(struct trans *trans,
         trans->extra_data = priv;
         trans->extra_destructor = libipm_trans_destructor;
 
+        g_sck_set_non_blocking(trans->sck);
+
         libipm_msg_in_reset(trans);
 
         rv = E_LI_SUCCESS;
diff --git a/tests/libipm/test_libipm_main.c b/tests/libipm/test_libipm_main.c
index 1ecfcaf0..22f89508 100644
--- a/tests/libipm/test_libipm_main.c
+++ b/tests/libipm/test_libipm_main.c
@@ -63,8 +63,6 @@ suite_test_libipm_calls_start(void)
         enum libipm_status init1;
         enum libipm_status init2;
 
-        g_sck_set_non_blocking(sck[1]);
-
         t1->sck = sck[0];
         t1->type1 = TRANS_TYPE_CLIENT;
         t1->status = TRANS_STATUS_UP;