diff --git a/cinderclient/tests/functional/hooks/post_test_hook.sh b/cinderclient/tests/functional/hooks/post_test_hook.sh
index 4e4c27b5c..8321a2cec 100755
--- a/cinderclient/tests/functional/hooks/post_test_hook.sh
+++ b/cinderclient/tests/functional/hooks/post_test_hook.sh
@@ -37,19 +37,6 @@ sudo chown -R jenkins:stack $CINDERCLIENT_DIR
 cd $STACK_DIR
 source openrc admin admin
 
-# Store these credentials into the config file
-CREDS_FILE=$CINDERCLIENT_DIR/functional_creds.conf
-cat <<EOF > $CREDS_FILE
-# Credentials for functional testing
-[auth]
-uri = $OS_AUTH_URL
-
-[admin]
-user = $OS_USERNAME
-tenant = $OS_TENANT_NAME
-pass = $OS_PASSWORD
-EOF
-
 # Go to the cinderclient dir
 cd $CINDERCLIENT_DIR
 
diff --git a/tox.ini b/tox.ini
index fcf3e5a60..8b2a1eedf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,7 +39,7 @@ setenv =
 # The OS_CACERT environment variable should be passed to the test
 # environments to specify a CA bundle file to use in verifying a
 # TLS (https) server certificate.
-passenv = OS_CACERT
+passenv = OS_*
 
 [flake8]
 show-source = True