diff --git a/tests/client/torture_knownhosts.c b/tests/client/torture_knownhosts.c
index a7415bb5..12dfbc82 100644
--- a/tests/client/torture_knownhosts.c
+++ b/tests/client/torture_knownhosts.c
@@ -27,6 +27,7 @@
 
 #include <sys/types.h>
 #include <pwd.h>
+#include <errno.h>
 
 #include "session.c"
 #include "known_hosts.c"
@@ -60,10 +61,13 @@ static int session_setup(void **state)
     struct torture_state *s = *state;
     int verbosity = torture_libssh_verbosity();
     struct passwd *pwd;
+    int rc;
 
     pwd = getpwnam("bob");
     assert_non_null(pwd);
-    setuid(pwd->pw_uid);
+
+    rc = setuid(pwd->pw_uid);
+    assert_return_code(rc, errno);
 
     s->ssh.session = ssh_new();
     assert_non_null(s->ssh.session);
diff --git a/tests/client/torture_knownhosts_verify.c b/tests/client/torture_knownhosts_verify.c
index 2baaea7f..e7017cbf 100644
--- a/tests/client/torture_knownhosts_verify.c
+++ b/tests/client/torture_knownhosts_verify.c
@@ -57,7 +57,9 @@ static int session_setup(void **state)
 
     pwd = getpwnam("bob");
     assert_non_null(pwd);
-    setuid(pwd->pw_uid);
+
+    rc = setuid(pwd->pw_uid);
+    assert_return_code(rc, errno);
 
     s->ssh.session = ssh_new();
     assert_non_null(s->ssh.session);
diff --git a/tests/client/torture_proxycommand.c b/tests/client/torture_proxycommand.c
index 8aa793ed..ea1e1838 100644
--- a/tests/client/torture_proxycommand.c
+++ b/tests/client/torture_proxycommand.c
@@ -8,6 +8,7 @@
 
 #include <sys/types.h>
 #include <pwd.h>
+#include <errno.h>
 
 static int sshd_setup(void **state)
 {
@@ -27,10 +28,13 @@ static int session_setup(void **state)
     struct torture_state *s = *state;
     int verbosity = torture_libssh_verbosity();
     struct passwd *pwd;
+    int rc;
 
     pwd = getpwnam("bob");
     assert_non_null(pwd);
-    setuid(pwd->pw_uid);
+
+    rc = setuid(pwd->pw_uid);
+    assert_return_code(rc, errno);
 
     s->ssh.session = ssh_new();
     assert_non_null(s->ssh.session);
diff --git a/tests/client/torture_request_env.c b/tests/client/torture_request_env.c
index bc878555..96723c70 100644
--- a/tests/client/torture_request_env.c
+++ b/tests/client/torture_request_env.c
@@ -28,6 +28,7 @@
 
 #include <sys/types.h>
 #include <pwd.h>
+#include <errno.h>
 
 static int sshd_setup(void **state)
 {
@@ -46,10 +47,13 @@ static int session_setup(void **state)
 {
     struct torture_state *s = *state;
     struct passwd *pwd;
+    int rc;
 
     pwd = getpwnam("bob");
     assert_non_null(pwd);
-    setuid(pwd->pw_uid);
+
+    rc = setuid(pwd->pw_uid);
+    assert_return_code(rc, errno);
 
     s->ssh.session = torture_ssh_session(TORTURE_SSH_SERVER,
                                          NULL,
diff --git a/tests/client/torture_session.c b/tests/client/torture_session.c
index ef0cb64d..d35f1fbc 100644
--- a/tests/client/torture_session.c
+++ b/tests/client/torture_session.c
@@ -30,6 +30,7 @@
 
 #include <sys/types.h>
 #include <pwd.h>
+#include <errno.h>
 
 #define BUFLEN 4096
 static char buffer[BUFLEN];
@@ -51,10 +52,13 @@ static int session_setup(void **state)
 {
     struct torture_state *s = *state;
     struct passwd *pwd;
+    int rc;
 
     pwd = getpwnam("bob");
     assert_non_null(pwd);
-    setuid(pwd->pw_uid);
+
+    rc = setuid(pwd->pw_uid);
+    assert_return_code(rc, errno);
 
     s->ssh.session = torture_ssh_session(TORTURE_SSH_SERVER,
                                          NULL,
diff --git a/tests/client/torture_sftp_dir.c b/tests/client/torture_sftp_dir.c
index 80ca43a8..182ed6b8 100644
--- a/tests/client/torture_sftp_dir.c
+++ b/tests/client/torture_sftp_dir.c
@@ -7,6 +7,7 @@
 
 #include <sys/types.h>
 #include <pwd.h>
+#include <errno.h>
 
 static int sshd_setup(void **state)
 {
@@ -25,10 +26,13 @@ static int session_setup(void **state)
 {
     struct torture_state *s = *state;
     struct passwd *pwd;
+    int rc;
 
     pwd = getpwnam("bob");
     assert_non_null(pwd);
-    setuid(pwd->pw_uid);
+
+    rc = setuid(pwd->pw_uid);
+    assert_return_code(rc, errno);
 
     s->ssh.session = torture_ssh_session(TORTURE_SSH_SERVER,
                                          NULL,
diff --git a/tests/client/torture_sftp_fsync.c b/tests/client/torture_sftp_fsync.c
index 3e61b0b7..a0bb2ebd 100644
--- a/tests/client/torture_sftp_fsync.c
+++ b/tests/client/torture_sftp_fsync.c
@@ -7,6 +7,7 @@
 
 #include <sys/types.h>
 #include <pwd.h>
+#include <errno.h>
 
 #define MAX_XFER_BUF_SIZE 16384
 
@@ -27,10 +28,13 @@ static int session_setup(void **state)
 {
     struct torture_state *s = *state;
     struct passwd *pwd;
+    int rc;
 
     pwd = getpwnam("bob");
     assert_non_null(pwd);
-    setuid(pwd->pw_uid);
+
+    rc = setuid(pwd->pw_uid);
+    assert_return_code(rc, errno);
 
     s->ssh.session = torture_ssh_session(TORTURE_SSH_SERVER,
                                          NULL,
diff --git a/tests/client/torture_sftp_read.c b/tests/client/torture_sftp_read.c
index a888a17b..a9df6abb 100644
--- a/tests/client/torture_sftp_read.c
+++ b/tests/client/torture_sftp_read.c
@@ -7,6 +7,7 @@
 
 #include <sys/types.h>
 #include <pwd.h>
+#include <errno.h>
 
 #define MAX_XFER_BUF_SIZE 16384
 
@@ -27,10 +28,13 @@ static int session_setup(void **state)
 {
     struct torture_state *s = *state;
     struct passwd *pwd;
+    int rc;
 
     pwd = getpwnam("bob");
     assert_non_null(pwd);
-    setuid(pwd->pw_uid);
+
+    rc = setuid(pwd->pw_uid);
+    assert_return_code(rc, errno);
 
     s->ssh.session = torture_ssh_session(TORTURE_SSH_SERVER,
                                          NULL,