diff --git a/diego/lifecycle_test.go b/diego/lifecycle_test.go
index 796bca71c..2f0462842 100644
--- a/diego/lifecycle_test.go
+++ b/diego/lifecycle_test.go
@@ -6,9 +6,9 @@ import (
 	. "github.com/onsi/gomega/gbytes"
 	. "github.com/onsi/gomega/gexec"
 
+	. "github.com/cloudfoundry-incubator/cf-test-helpers/cf"
+	. "github.com/cloudfoundry-incubator/cf-test-helpers/generator"
 	. "github.com/cloudfoundry/cf-acceptance-tests/helpers"
-	. "github.com/pivotal-cf-experimental/cf-test-helpers/cf"
-	. "github.com/pivotal-cf-experimental/cf-test-helpers/generator"
 )
 
 var _ = Describe("Application staging with Diego", func() {
@@ -29,7 +29,7 @@ var _ = Describe("Application staging with Diego", func() {
 
 	Describe("pushing", func() {
 		It("makes the app reachable via its bound route", func() {
-			Eventually(CurlFetcher(appName, "/", LoadConfig().AppsDomain), DefaultTimeout).Should(ContainSubstring("Hi, I'm Dora!"))
+			Expect(CurlAppRoot(appName)).To(ContainSubstring("Hi, I'm Dora!"))
 		})
 	})
 
@@ -39,7 +39,7 @@ var _ = Describe("Application staging with Diego", func() {
 		})
 
 		It("makes the app unreachable", func() {
-			Eventually(CurlFetcher(appName, "/", LoadConfig().AppsDomain), DefaultTimeout).Should(ContainSubstring("404"))
+			Expect(CurlAppRoot(appName)).To(ContainSubstring("404"))
 		})
 
 		Describe("and then starting", func() {
@@ -48,18 +48,18 @@ var _ = Describe("Application staging with Diego", func() {
 			})
 
 			It("makes the app reachable again", func() {
-				Eventually(CurlFetcher(appName, "/", LoadConfig().AppsDomain), DefaultTimeout).Should(ContainSubstring("Hi, I'm Dora!"))
+				Expect(CurlAppRoot(appName)).To(ContainSubstring("Hi, I'm Dora!"))
 			})
 		})
 	})
 
 	Describe("updating", func() {
 		It("is reflected through another push", func() {
-			Eventually(CurlFetcher(appName, "/", LoadConfig().AppsDomain), DefaultTimeout).Should(ContainSubstring("Hi, I'm Dora!"))
+			Expect(CurlAppRoot(appName)).To(ContainSubstring("Hi, I'm Dora!"))
 
 			Eventually(Cf("push", appName, "-p", NewAssets().HelloWorld), CFPushTimeout).Should(Exit(0))
 
-			Eventually(CurlFetcher(appName, "/", LoadConfig().AppsDomain), DefaultTimeout).Should(ContainSubstring("Hello, world!"))
+			Expect(CurlAppRoot(appName)).To(ContainSubstring("Hello, world!"))
 		})
 	})
 
@@ -70,7 +70,7 @@ var _ = Describe("Application staging with Diego", func() {
 
 		It("removes the application and makes the app unreachable", func() {
 			Eventually(Cf("app", appName), DefaultTimeout).Should(Say("not found"))
-			Eventually(CurlFetcher(appName, "/", LoadConfig().AppsDomain), DefaultTimeout).Should(ContainSubstring("404"))
+			Expect(CurlAppRoot(appName)).To(ContainSubstring("404"))
 		})
 	})
 })
diff --git a/diego/staging_failure_test.go b/diego/staging_failure_test.go
index 5370b248e..82a547060 100644
--- a/diego/staging_failure_test.go
+++ b/diego/staging_failure_test.go
@@ -5,9 +5,9 @@ import (
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gexec"
 
+	. "github.com/cloudfoundry-incubator/cf-test-helpers/cf"
+	. "github.com/cloudfoundry-incubator/cf-test-helpers/generator"
 	. "github.com/cloudfoundry/cf-acceptance-tests/helpers"
-	. "github.com/pivotal-cf-experimental/cf-test-helpers/cf"
-	. "github.com/pivotal-cf-experimental/cf-test-helpers/generator"
 )
 
 var _ = Describe("When staging fails", func() {
diff --git a/diego/staging_log_test.go b/diego/staging_log_test.go
index 1f8a73d26..bb37aedb0 100644
--- a/diego/staging_log_test.go
+++ b/diego/staging_log_test.go
@@ -6,9 +6,9 @@ import (
 	. "github.com/onsi/gomega/gbytes"
 	. "github.com/onsi/gomega/gexec"
 
+	. "github.com/cloudfoundry-incubator/cf-test-helpers/cf"
+	. "github.com/cloudfoundry-incubator/cf-test-helpers/generator"
 	. "github.com/cloudfoundry/cf-acceptance-tests/helpers"
-	. "github.com/pivotal-cf-experimental/cf-test-helpers/cf"
-	. "github.com/pivotal-cf-experimental/cf-test-helpers/generator"
 )
 
 var _ = Describe("An application being staged with Diego", func() {