diff --git a/tool/run/log/amt b/tool/run/log/amt
index cb48390067..102c481814 100644
--- a/tool/run/log/amt
+++ b/tool/run/log/amt
@@ -34,10 +34,15 @@ proc run_log { wait_for_re timeout_value } {
 		return false
 	}
 
+	#
+	# amttool expects in the environment variable AMT_PASSWORD the password
+	#
+	set ::env(AMT_PASSWORD) [log_amt_password]
+
 	#
 	# grab output
 	#
-	set amt_cmd "amtterm -u admin -p [log_amt_password] -v [log_amt_host]"
+	set amt_cmd "amtterm -u admin -v [log_amt_host]"
 	if {[get_cmd_switch --log-amt-filter]} {
 		set amt_cmd "$amt_cmd | [log_amt_filter]"
 	}