diff --git a/command/v7/auth_command_test.go b/command/v7/auth_command_test.go
index 9f015ea373a..152c648a3c9 100644
--- a/command/v7/auth_command_test.go
+++ b/command/v7/auth_command_test.go
@@ -42,7 +42,7 @@ var _ = Describe("auth Command", func() {
 		binaryName = "faceman"
 		fakeConfig.BinaryNameReturns(binaryName)
 		fakeConfig.UAAOAuthClientReturns("cf")
-		fakeConfig.APIVersionReturns("3.85.0")
+		fakeConfig.APIVersionReturns("3.99.0")
 	})
 
 	JustBeforeEach(func() {
@@ -215,7 +215,7 @@ var _ = Describe("auth Command", func() {
 					It("warns that the user is targeting an unsupported API version and that things may not work correctly", func() {
 						Expect(err).ToNot(HaveOccurred())
 						Expect(testUI.Out).To(Say("API endpoint: %s", fakeConfig.Target()))
-						Expect(testUI.Err).To(Say("Warning: Your targeted API's version \\(3.83.0\\) is less than the minimum supported API version \\(3.85.0\\). Some commands may not function correctly."))
+						Expect(testUI.Err).To(Say("Warning: Your targeted API's version \\(3.83.0\\) is less than the minimum supported API version \\(3.99.0\\). Some commands may not function correctly."))
 					})
 				})
 
diff --git a/command/v7/login_command_test.go b/command/v7/login_command_test.go
index bc3ce9dca50..51b059834d5 100644
--- a/command/v7/login_command_test.go
+++ b/command/v7/login_command_test.go
@@ -56,7 +56,7 @@ var _ = Describe("login Command", func() {
 		cmd.APIEndpoint = ""
 
 		fakeActorReloader.ReloadReturns(fakeActor, nil)
-		fakeConfig.APIVersionReturns("3.85.0")
+		fakeConfig.APIVersionReturns("3.99.0")
 	})
 
 	JustBeforeEach(func() {
@@ -192,7 +192,7 @@ var _ = Describe("login Command", func() {
 						fakeConfig.APIVersionReturns("3.83.0")
 					})
 					It("warns that the user is targeting an unsupported API version and that things may not work correctly", func() {
-						Expect(testUI.Err).To(Say("Warning: Your targeted API's version \\(3.83.0\\) is less than the minimum supported API version \\(3.85.0\\). Some commands may not function correctly."))
+						Expect(testUI.Err).To(Say("Warning: Your targeted API's version \\(3.83.0\\) is less than the minimum supported API version \\(3.99.0\\). Some commands may not function correctly."))
 					})
 				})
 
diff --git a/command/v7/shared/version_checker.go b/command/v7/shared/version_checker.go
index afe65b19ac1..7a83be7c464 100644
--- a/command/v7/shared/version_checker.go
+++ b/command/v7/shared/version_checker.go
@@ -6,7 +6,7 @@ import (
 	"github.com/blang/semver"
 )
 
-const minimumCCAPIVersionForV7 = "3.85.0"
+const minimumCCAPIVersionForV8 = "3.99.0"
 
 func CheckCCAPIVersion(currentAPIVersion string) (string, error) {
 	currentSemver, err := semver.Make(currentAPIVersion)
@@ -14,13 +14,13 @@ func CheckCCAPIVersion(currentAPIVersion string) (string, error) {
 		return "", err
 	}
 
-	minimumSemver, err := semver.Make(minimumCCAPIVersionForV7)
+	minimumSemver, err := semver.Make(minimumCCAPIVersionForV8)
 	if err != nil {
 		return "", err
 	}
 
 	if currentSemver.LT(minimumSemver) {
-		return fmt.Sprintf("\nWarning: Your targeted API's version (%s) is less than the minimum supported API version (%s). Some commands may not function correctly.", currentAPIVersion, minimumCCAPIVersionForV7), nil
+		return fmt.Sprintf("\nWarning: Your targeted API's version (%s) is less than the minimum supported API version (%s). Some commands may not function correctly.", currentAPIVersion, minimumCCAPIVersionForV8), nil
 	}
 
 	return "", nil
diff --git a/command/v7/shared/version_checker_test.go b/command/v7/shared/version_checker_test.go
index 7003121feb5..451ff6e9893 100644
--- a/command/v7/shared/version_checker_test.go
+++ b/command/v7/shared/version_checker_test.go
@@ -15,7 +15,7 @@ var _ = Describe("version checker", func() {
 
 	Context("CheckCCAPIVersion", func() {
 		BeforeEach(func() {
-			currentCCVersion = "3.85.0"
+			currentCCVersion = "3.99.0"
 		})
 
 		JustBeforeEach(func() {
@@ -34,7 +34,7 @@ var _ = Describe("version checker", func() {
 
 			It("does return a warning", func() {
 				Expect(executeErr).ToNot(HaveOccurred())
-				Expect(warning).To(Equal("\nWarning: Your targeted API's version (3.83.0) is less than the minimum supported API version (3.85.0). Some commands may not function correctly."))
+				Expect(warning).To(Equal("\nWarning: Your targeted API's version (3.83.0) is less than the minimum supported API version (3.99.0). Some commands may not function correctly."))
 			})
 		})