diff --git a/src/acceptance/app/cf_metadata_test.go b/src/acceptance/app/cf_metadata_test.go
index c098b9d1dc..4683f454df 100644
--- a/src/acceptance/app/cf_metadata_test.go
+++ b/src/acceptance/app/cf_metadata_test.go
@@ -1,7 +1,6 @@
 package app_test
 
 import (
-	"acceptance"
 	. "acceptance/helpers"
 	"time"
 
@@ -24,26 +23,15 @@ var _ = Describe("AutoScaler CF metadata support", func() {
 	})
 	AfterEach(AppAfterEach)
 
-	Context("when scaling by custom metrics", func() {
-		It("should scale out normally", Label(acceptance.LabelSmokeTests), func() {
-			By("Scale out to 2 instances")
+	When("the label app-autoscaler.cloudfoundry.org/disable-autoscaling is set", func() {
+		It("should not scale out", func() {
+			By("Set the label app-autoscaler.cloudfoundry.org/disable-autoscaling to true")
+			SetLabel(cfg, appGUID, "app-autoscaler.cloudfoundry.org/disable-autoscaling", "true")
 			scaleOut := sendMetricToAutoscaler(cfg, appGUID, appName, 550, true)
-			Eventually(scaleOut).
+			Consistently(scaleOut).
 				WithTimeout(5 * time.Minute).
 				WithPolling(15 * time.Second).
-				Should(Equal(2))
-		})
-
-		Context("when the label app-autoscaler.cloudfoundry.org/disable-autoscaling is set", func() {
-			It("should not scale out", Label(acceptance.LabelSmokeTests), func() {
-				By("Set the label app-autoscaler.cloudfoundry.org/disable-autoscaling to true")
-				SetLabel(cfg, appGUID, "app-autoscaler.cloudfoundry.org/disable-autoscaling", "true")
-				scaleOut := sendMetricToAutoscaler(cfg, appGUID, appName, 550, true)
-				Consistently(scaleOut).
-					WithTimeout(5 * time.Minute).
-					WithPolling(15 * time.Second).
-					Should(Equal(1))
-			})
+				Should(Equal(1))
 		})
 	})
 })