diff --git a/internal/tests/cli/boundary/_accounts.bash b/internal/tests/cli/boundary/_accounts.bash
index 7eb06ead8..9444bc31a 100644
--- a/internal/tests/cli/boundary/_accounts.bash
+++ b/internal/tests/cli/boundary/_accounts.bash
@@ -1,5 +1,6 @@
 function create_account() {
-  boundary accounts create password -login-name $1 -password $DEFAULT_PASSWORD -auth-method-id $DEFAULT_AMPW
+  export BP="${DEFAULT_PASSWORD}"
+  boundary accounts create password -login-name $1 -password env://BP -auth-method-id $DEFAULT_AMPW
 }
 
 function read_account() {
diff --git a/internal/tests/cli/boundary/_credentials.bash b/internal/tests/cli/boundary/_credentials.bash
index 016ab48b7..fc740ed95 100644
--- a/internal/tests/cli/boundary/_credentials.bash
+++ b/internal/tests/cli/boundary/_credentials.bash
@@ -6,12 +6,13 @@ function create_username_password_credential() {
   local user=$3
   local pass=$4
   
+  export BP="${pass}"
   boundary credentials create username-password \
     -name $name \
     -description 'test username password credential' \
     -credential-store-id $sid \
     -username $user \
-    -password $pass
+    -password env://BP
 }
 
 function read_credential() {