diff --git a/ci/configure_v5.sh b/ci/configure_v5.sh
index c5835760..492b020b 100755
--- a/ci/configure_v5.sh
+++ b/ci/configure_v5.sh
@@ -1,3 +1,8 @@
 #!/bin/bash -ex
 
 docker-compose exec -T conjur_5 conjurctl wait -r 30 -p 80
+
+# load the pcf policy for the non-empty CONJUR_POLICY test
+api_key=$(docker-compose exec -T conjur_5 bash -c 'rails r "puts Role[%Q{cucumber:user:admin}].api_key" 2>/dev/null')
+export CONJUR_AUTHN_API_KEY="$api_key"
+docker-compose run --rm --entrypoint bash client -c "conjur policy load root /app/ci/policy.yml"
diff --git a/test.sh b/test.sh
index 22d5ad27..c45fe426 100755
--- a/test.sh
+++ b/test.sh
@@ -29,12 +29,9 @@ function runTests5() {
   export CONJUR_APPLIANCE_URL=http://conjur_5
   export CONJUR_SSL_CERTIFICATE=""
 
-  local api_key=$(docker-compose exec -T conjur_5 bash -c 'rails r "puts Role[%Q{cucumber:user:admin}].api_key" 2>/dev/null')
+  local api_key=$(docker-compose exec -T conjur_5 bash -c 'rails r "puts Role[%Q{cucumber:user:pcf-admin}].api_key" 2>/dev/null')
   export CONJUR_AUTHN_API_KEY="$api_key"
 
-  # load the pcf policy for the non-empty CONJUR_POLICY test
-  docker-compose run --rm --entrypoint bash client -c "conjur policy load root /app/ci/policy.yml"
-
   runTests
 }
 
@@ -51,7 +48,7 @@ function runTests4() {
   export CONJUR_APPLIANCE_URL=https://conjur_4/api
   export CONJUR_SSL_CERTIFICATE="$(cat tmp/conjur.pem)"
 
-  local api_key=$(docker-compose exec -T conjur_4 su conjur -c "conjur-plugin-service authn env RAILS_ENV=appliance rails r \"puts User['admin'].api_key\" 2>/dev/null")
+  local api_key=$(docker-compose exec -T conjur_4 su conjur -c "conjur-plugin-service authn env RAILS_ENV=appliance rails r \"puts User['pcf-admin'].api_key\" 2>/dev/null")
   export CONJUR_AUTHN_API_KEY="$api_key"
 
   runTests