diff --git a/tests/bot-entrypoint.sh b/tests/bot-entrypoint.sh
index ba8f119..b94b43a 100755
--- a/tests/bot-entrypoint.sh
+++ b/tests/bot-entrypoint.sh
@@ -2,6 +2,9 @@
 set -euo pipefail
 IFS=$'\n\t'
 
+export "KEYBASE_USERNAME=$BOT_USERNAME"
+export "KEYBASE_PAPERKEY=$BOT_PAPERKEY"
+
 # For some reason it is necessary to touch a file in /shared/ in order to get the volume permissions to work correctly
 # when keybaseca generate runs
 touch /shared/.keep
@@ -12,6 +15,6 @@ ls tests/envFiles/ | xargs -I {} -- bash -c 'cat tests/envFiles/{} | envsubst >
 
 nohup bash -c "KEYBASE_RUN_MODE=prod kbfsfuse /keybase | grep -v 'ERROR Mounting the filesystem failed' &"
 sleep 3
-keybase oneshot --username $BOT_USERNAME --paperkey "$BOT_PAPERKEY"
+keybase oneshot
 touch /shared/ready
 python3 tests/bot-entrypoint.py
diff --git a/tests/tester-entrypoint.sh b/tests/tester-entrypoint.sh
index d277fe5..9347cfe 100755
--- a/tests/tester-entrypoint.sh
+++ b/tests/tester-entrypoint.sh
@@ -2,6 +2,9 @@
 set -euo pipefail
 IFS=$'\n\t'
 
+export "KEYBASE_USERNAME=$KSSH_USERNAME"
+export "KEYBASE_PAPERKEY=$KSSH_PAPERKEY"
+
 nohup bash -c "run_keybase -g &"
 
 # Sleep until the CA bot has started
@@ -12,7 +15,7 @@ done
 echo ""
 sleep 2
 
-keybase oneshot --username $KSSH_USERNAME --paperkey "$KSSH_PAPERKEY"
+keybase oneshot
 
 echo "========================= Launched Keybase, starting tests... ========================="