diff --git a/xCAT-test/unit/cmdlog_response_redact.t b/xCAT-test/unit/cmdlog_response_redact.t
new file mode 100644
index 000000000..e79f4cd85
--- /dev/null
+++ b/xCAT-test/unit/cmdlog_response_redact.t
@@ -0,0 +1,95 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+
+use FindBin;
+use Test::More;
+
+my $xcatd = "$FindBin::Bin/../../xCAT-server/sbin/xcatd";
+plan skip_all => 'xcatd not found' unless -r $xcatd;
+
+open my $fh, '<', $xcatd or die $!;
+my $src = do { local $/; <$fh> };
+close $fh;
+
+# Extract the three command-log response subs and load them. xcatd is present,
+# so a sub that cannot be extracted is a hard failure, not a skip.
+my %sub;
+for my $name (qw(cmdlog_response_is_sensitive cmdlog_finalize_response cmdlog_collectlog)) {
+    my ($body) = $src =~ /(^sub \Q$name\E\b.*?^\})/ms;
+    BAIL_OUT("could not extract $name from xcatd") unless $body;
+    $body =~ s/^sub \Q$name\E\(\)/sub $name/m;
+    $sub{$name} = $body;
+}
+
+our $cmdlog_alllog;
+our $cmdlog_response_buffer;
+our $cmdlog_response_sensitive;
+our $MYXCATSERVER = "";
+{
+    no strict;
+    no warnings;
+    eval "$sub{cmdlog_response_is_sensitive}\n$sub{cmdlog_finalize_response}\n$sub{cmdlog_collectlog}";
+}
+die "eval of command-log subs failed: $@" if $@;
+
+# Classification from the request.
+ok(cmdlog_response_is_sensitive({ command => ['getcredentials'], arg => [] }, ''),
+    'getcredentials is a sensitive-response command');
+ok(cmdlog_response_is_sensitive({ command => ['gettab'], arg => ['key=xcat', 'passwd.password'] }, ''),
+    'gettab of a passwd column is sensitive');
+ok(cmdlog_response_is_sensitive({ command => ['tabdump'], arg => ['passwd'] }, ''),
+    'tabdump passwd is sensitive');
+ok(cmdlog_response_is_sensitive({ command => ['rspconfig'], arg => [] }, 1),
+    'a redacted request is sensitive');
+ok(!cmdlog_response_is_sensitive({ command => ['rpower'], arg => ['n1', 'stat'] }, 0),
+    'a benign request is not sensitive');
+
+# Drive collect(s) then finalize, returning what was appended to the log.
+sub run {
+    my ($sensitive, @responses) = @_;
+    $cmdlog_alllog = "";
+    $cmdlog_response_buffer = "";
+    $cmdlog_response_sensitive = $sensitive;
+    cmdlog_collectlog({ xcatresponse => [ { data => [$_] } ] }) for @responses;
+    cmdlog_finalize_response();
+    return $cmdlog_alllog;
+}
+
+# A bare passwd value (gettab passwd.password) has no "passw" in the response,
+# so only the request classification catches it.
+my $bare = run(1, "S3cr3tPW");
+unlike($bare, qr/S3cr3tPW/, 'a bare passwd value is not logged');
+like($bare, qr/\*REDACTED\*/, 'a sensitive response is redacted');
+
+# A secret split across callbacks is redacted regardless of order.
+unlike(run(0, "password", "S3cr3tPW"), qr/S3cr3tPW/,
+    'multi-callback, passw first: the secret fragment is not logged');
+unlike(run(0, "S3cr3tPW", "password"), qr/S3cr3tPW/,
+    'multi-callback, secret first: the earlier fragment is redacted too');
+
+# Fallback: a response mentioning a password is redacted even without request signal.
+like(run(0, "invalid password for node"), qr/\*REDACTED\*/,
+    'a response mentioning a password is redacted by the fallback');
+
+# A benign response is logged verbatim.
+my $benign = run(0, "node01: on");
+like($benign, qr/node01: on/, 'a benign response is logged verbatim');
+unlike($benign, qr/\*REDACTED\*/, 'a benign response is not redacted');
+
+# Two requests on one connection: the finalizer runs at the next command's
+# start. The earlier response must be preserved (redacted), the flag reset, and
+# the next benign response neither lost nor over-redacted.
+$cmdlog_alllog = "";
+$cmdlog_response_buffer = "";
+$cmdlog_response_sensitive = 1;
+cmdlog_collectlog({ xcatresponse => [ { data => ["SECRET_N"] } ] });
+cmdlog_finalize_response();
+is($cmdlog_response_sensitive, 0, 'finalize clears the sensitive flag');
+cmdlog_collectlog({ xcatresponse => [ { data => ["benign_np1"] } ] });
+cmdlog_finalize_response();
+like($cmdlog_alllog, qr/\*REDACTED\*/, 'the earlier sensitive response is preserved as redacted, not lost');
+like($cmdlog_alllog, qr/benign_np1/, 'the next benign response is logged, not over-redacted');
+unlike($cmdlog_alllog, qr/SECRET_N/, 'the earlier secret is not leaked');
+
+done_testing();