diff --git a/README.md b/README.md
index af261501a..14c6c93a0 100644
--- a/README.md
+++ b/README.md
@@ -288,6 +288,11 @@ When a test fails, look for the test group name (`[services]` in the example bel
 
 If you set a value for `artifacts_directory` in your `$CONFIG` file, then you will be able to capture `cf` trace output from failed test runs, this output may be useful in cases where the normal test output is not enough to debug an issue.  The `cf` trace output for the tests in these specs will be found in `CF-TRACE-Applications-*.txt` in the `artifacts_directory`.
 
+**NOTE:**
+If the default identity provider for your deployment is not `uaa`, it is
+recommended that you set the `origin` configuration property to `uaa`, and ensure
+the user credentials that you provide are registered with UAA.
+
 ## Test Execution
 To execute tests according to your configuration, run the [bin/test](./bin/test)
 script with `$CONFIG` set to your
diff --git a/helpers/config/config_struct.go b/helpers/config/config_struct.go
index 403f22094..9f186a2b6 100644
--- a/helpers/config/config_struct.go
+++ b/helpers/config/config_struct.go
@@ -29,6 +29,7 @@ type config struct {
 	ExistingUserPassword *string `json:"existing_user_password"`
 	ShouldKeepUser       *bool   `json:"keep_user_at_suite_end"`
 	UseExistingUser      *bool   `json:"use_existing_user"`
+	Origin               *string `json:"origin"`
 
 	UseExistingOrganization *bool   `json:"use_existing_organization"`
 	ExistingOrganization    *string `json:"existing_organization"`
@@ -269,6 +270,8 @@ func getDefaults() config {
 
 	defaults.Stacks = &[]string{"cflinuxfs4"}
 
+	defaults.Origin = ptrToString("")
+
 	return defaults
 }
 
@@ -953,7 +956,7 @@ func (c *config) GetExistingUserPassword() string {
 }
 
 func (c *config) GetUserOrigin() string {
-	return ""
+	return *c.Origin
 }
 
 func (c *config) GetConfigurableTestPassword() string {
@@ -977,7 +980,7 @@ func (c *config) GetAdminPassword() string {
 }
 
 func (c *config) GetAdminOrigin() string {
-	return ""
+	return *c.Origin
 }
 
 func (c *config) GetApiEndpoint() string {