diff --git a/src/basic/copy.c b/src/basic/copy.c
index 773f7b8067..be4ca6288a 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -482,7 +482,7 @@ static int hardlink_context_realize(HardlinkContext *c) {
         c->dir_fd = openat(c->parent_fd, c->subdir, O_RDONLY|O_DIRECTORY|O_CLOEXEC);
         if (c->dir_fd < 0) {
                 r = -errno;
-                unlinkat(c->parent_fd, c->subdir, AT_REMOVEDIR);
+                (void) unlinkat(c->parent_fd, c->subdir, AT_REMOVEDIR);
                 return r;
         }
 
diff --git a/src/test/test-env-file.c b/src/test/test-env-file.c
index 861238169b..23779b9b87 100644
--- a/src/test/test-env-file.c
+++ b/src/test/test-env-file.c
@@ -151,7 +151,7 @@ static void test_write_and_load_env_file(void) {
                 _cleanup_(unlink_and_freep) char *p = NULL;
                 _cleanup_strv_free_ char **l = NULL;
                 _cleanup_free_ char *j = NULL, *w = NULL, *cmd = NULL, *from_shell = NULL;
-                _cleanup_fclose_ FILE *f = NULL;
+                _cleanup_pclose_ FILE *f = NULL;
                 size_t sz;
 
                 assert_se(tempfn_random_child(NULL, NULL, &p) >= 0);
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index 9c0b3533c2..ce5af43db5 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -153,7 +153,7 @@ static void test_parse_env_file(void) {
 
 static void test_one_shell_var(const char *file, const char *variable, const char *value) {
         _cleanup_free_ char *cmd = NULL, *from_shell = NULL;
-        _cleanup_fclose_ FILE *f = NULL;
+        _cleanup_pclose_ FILE *f = NULL;
         size_t sz;
 
         assert_se(cmd = strjoin(". ", file, " && /bin/echo -n \"$", variable, "\""));