diff --git a/test/zdtm/live/static/cwd00.c b/test/zdtm/live/static/cwd00.c
index abdd3d98b..49ed2e387 100644
--- a/test/zdtm/live/static/cwd00.c
+++ b/test/zdtm/live/static/cwd00.c
@@ -43,17 +43,15 @@ int main(int argc, char **argv)
 
 	if (!getcwd(cwd2, sizeof(cwd2))) {
 		fail("can't get cwd: %m\n");
-		goto out;
+		goto cleanup;
 	}
 
 	if (strcmp(cwd1, cwd2))
 		fail("%s != %s\n", cwd1, cwd2);
 	else
 		pass();
-out:
-	chdir(cwd0);	/* return to the initial dir before writing out results */
 cleanup:
-	chdir(cwd0);
+	chdir(cwd0);	/* return to the initial dir before writing out results */
 	rmdir(dirname);
 	return 0;
 }