@@ -530,12 +530,16 @@ EOF

         local auth_vers

         auth_vers=$(iniget ${testfile} func_test auth_version)

         iniset ${testfile} func_test auth_host ${KEYSTONE_SERVICE_HOST}

-        iniset ${testfile} func_test auth_port ${KEYSTONE_AUTH_PORT}

+        if [[ "$KEYSTONE_AUTH_PROTOCOL" == "https" ]]; then

+            iniset ${testfile} func_test auth_port 443

+        else

+            iniset ${testfile} func_test auth_port 80

+        fi

         iniset ${testfile} func_test auth_uri ${KEYSTONE_AUTH_URI}

-        if [[ $auth_vers == "3" ]]; then

-            iniset ${testfile} func_test auth_prefix /v3/

+        if [[ "$auth_vers" == "3" ]]; then

+            iniset ${testfile} func_test auth_prefix /identity/v3/

         else

-            iniset ${testfile} func_test auth_prefix /v2.0/

+            iniset ${testfile} func_test auth_prefix /identity/v2.0/

         fi

     fi