diff --git a/go.mod b/go.mod
index a6fc0aa83..8ffa91753 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	code.cloudfoundry.org/go-diodes v0.0.0-20180905200951-72629b5276e3 // indirect
 	code.cloudfoundry.org/go-loggregator v7.3.0+incompatible
 	code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a // indirect
-	github.com/cloudfoundry-incubator/cf-test-helpers v1.0.1-0.20190819181953-621a86920bf4
+	github.com/cloudfoundry-incubator/cf-test-helpers v1.0.1-0.20191216200933-cf8305784c93
 	github.com/cloudfoundry/custom-cats-reporters v0.0.0-20180629210428-75213ee79907
 	github.com/cloudfoundry/gosteno v0.0.0-20150423193413-0c8581caea35 // indirect
 	github.com/cloudfoundry/loggregatorlib v0.0.0-20160505035404-03bfd6ee4743 // indirect
diff --git a/go.sum b/go.sum
index 04b76f037..f65cd7211 100644
--- a/go.sum
+++ b/go.sum
@@ -9,8 +9,8 @@ code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a h1:8rqv2w8xEceN
 code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a/go.mod h1:tkZo8GtzBjySJ7USvxm4E36lNQw1D3xM6oKHGqdaAJ4=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudfoundry-incubator/cf-test-helpers v1.0.1-0.20190819181953-621a86920bf4 h1:gkOZVJxmicnV8y/IDOfmy/dLVY9UYSxWzBd3jUrOqws=
-github.com/cloudfoundry-incubator/cf-test-helpers v1.0.1-0.20190819181953-621a86920bf4/go.mod h1:I21tkmFwW9F06eYcQm5GTUzNV+pc1Q5NVZ1qhWOGGx0=
+github.com/cloudfoundry-incubator/cf-test-helpers v1.0.1-0.20191216200933-cf8305784c93 h1:pR151JVQERQPe1+8qeWVr+9FAQ5iJQfUIiCYNJi+tcg=
+github.com/cloudfoundry-incubator/cf-test-helpers v1.0.1-0.20191216200933-cf8305784c93/go.mod h1:I21tkmFwW9F06eYcQm5GTUzNV+pc1Q5NVZ1qhWOGGx0=
 github.com/cloudfoundry/custom-cats-reporters v0.0.0-20180629210428-75213ee79907 h1:wyYh6Iv81IwgCyIBG7OW34s5GQOGuWPWECF47arkSNQ=
 github.com/cloudfoundry/custom-cats-reporters v0.0.0-20180629210428-75213ee79907/go.mod h1:uxXHu50QB3u67C2PZlaFBlc9yTy9gQ4Nb+nL3J959bU=
 github.com/cloudfoundry/gosteno v0.0.0-20150423193413-0c8581caea35 h1:HdAWGlVEbFxuALqHXYu14XvAbRbyWZLd817ojygGnk0=
diff --git a/vendor/github.com/cloudfoundry-incubator/cf-test-helpers/workflowhelpers/test_suite_setup.go b/vendor/github.com/cloudfoundry-incubator/cf-test-helpers/workflowhelpers/test_suite_setup.go
index a51cb3b1f..296cd719a 100644
--- a/vendor/github.com/cloudfoundry-incubator/cf-test-helpers/workflowhelpers/test_suite_setup.go
+++ b/vendor/github.com/cloudfoundry-incubator/cf-test-helpers/workflowhelpers/test_suite_setup.go
@@ -109,7 +109,7 @@ func NewBaseTestSuiteSetup(config testSuiteConfig, testSpace internal.Space, tes
 		adminUserContext:   adminUserContext,
 
 		SkipUserCreation:      skipUserCreation,
-		SkipSpaceRoleCreation: !config.GetAddExistingUserToExistingSpace() && skipUserCreation,
+		SkipSpaceRoleCreation: !config.GetAddExistingUserToExistingSpace() && config.GetUseExistingSpace() && skipUserCreation,
 		TestSpace:             testSpace,
 		TestUser:              testUser,
 	}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 7ffd13a11..6fd23e654 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -7,7 +7,7 @@ code.cloudfoundry.org/go-loggregator
 code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2
 # code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a
 code.cloudfoundry.org/rfc5424
-# github.com/cloudfoundry-incubator/cf-test-helpers v1.0.1-0.20190819181953-621a86920bf4
+# github.com/cloudfoundry-incubator/cf-test-helpers v1.0.1-0.20191216200933-cf8305784c93
 github.com/cloudfoundry-incubator/cf-test-helpers/cf
 github.com/cloudfoundry-incubator/cf-test-helpers/commandreporter
 github.com/cloudfoundry-incubator/cf-test-helpers/commandstarter