diff --git a/internal/cloud/backend_test.go b/internal/cloud/backend_test.go
index ce4f5fe1ef..c73109bf48 100644
--- a/internal/cloud/backend_test.go
+++ b/internal/cloud/backend_test.go
@@ -447,9 +447,9 @@ func TestCloud_config(t *testing.T) {
 		confErr string
 		valErr  string
 	}{
-		"with_an_unknown_host": {
+		"with_a_non_tfe_host": {
 			config: cty.ObjectVal(map[string]cty.Value{
-				"hostname":     cty.StringVal("nonexisting.local"),
+				"hostname":     cty.StringVal("nontfe.local"),
 				"organization": cty.StringVal("hashicorp"),
 				"token":        cty.NullVal(cty.String),
 				"workspaces": cty.ObjectVal(map[string]cty.Value{
@@ -457,7 +457,7 @@ func TestCloud_config(t *testing.T) {
 					"tags": cty.NullVal(cty.Set(cty.String)),
 				}),
 			}),
-			confErr: "Failed to request discovery document",
+			confErr: "Host nontfe.local does not provide a tfe service",
 		},
 		// localhost advertises TFE services, but has no token in the credentials
 		"without_a_token": {
@@ -532,22 +532,24 @@ func TestCloud_config(t *testing.T) {
 	}
 
 	for name, tc := range cases {
-		b, cleanup := testUnconfiguredBackend(t)
-		t.Cleanup(cleanup)
+		t.Run(name, func(t *testing.T) {
+			b, cleanup := testUnconfiguredBackend(t)
+			t.Cleanup(cleanup)
 
-		// Validate
-		_, valDiags := b.PrepareConfig(tc.config)
-		if (valDiags.Err() != nil || tc.valErr != "") &&
-			(valDiags.Err() == nil || !strings.Contains(valDiags.Err().Error(), tc.valErr)) {
-			t.Fatalf("%s: unexpected validation result: %v", name, valDiags.Err())
-		}
+			// Validate
+			_, valDiags := b.PrepareConfig(tc.config)
+			if (valDiags.Err() != nil || tc.valErr != "") &&
+				(valDiags.Err() == nil || !strings.Contains(valDiags.Err().Error(), tc.valErr)) {
+				t.Fatalf("unexpected validation result: %v", valDiags.Err())
+			}
 
-		// Configure
-		confDiags := b.Configure(tc.config)
-		if (confDiags.Err() != nil || tc.confErr != "") &&
-			(confDiags.Err() == nil || !strings.Contains(confDiags.Err().Error(), tc.confErr)) {
-			t.Fatalf("%s: unexpected configure result: %v", name, confDiags.Err())
-		}
+			// Configure
+			confDiags := b.Configure(tc.config)
+			if (confDiags.Err() != nil || tc.confErr != "") &&
+				(confDiags.Err() == nil || !strings.Contains(confDiags.Err().Error(), tc.confErr)) {
+				t.Fatalf("unexpected configure result: %v", confDiags.Err())
+			}
+		})
 	}
 }
 
diff --git a/internal/cloud/testing.go b/internal/cloud/testing.go
index 79fc3c0444..ef0d9ed8b2 100644
--- a/internal/cloud/testing.go
+++ b/internal/cloud/testing.go
@@ -466,6 +466,7 @@ func testDisco(s *httptest.Server) *disco.Disco {
 
 	d.ForceHostServices(svchost.Hostname(defaultHostname), services)
 	d.ForceHostServices(svchost.Hostname("localhost"), services)
+	d.ForceHostServices(svchost.Hostname("nontfe.local"), nil)
 	return d
 }