diff --git a/dependency/dependency.go b/dependency/dependency.go
index c9e5cd532..dbe6d959b 100644
--- a/dependency/dependency.go
+++ b/dependency/dependency.go
@@ -185,7 +185,7 @@ func GetConsulQueryOpts(queryMap map[string]string, endpointLabel string) (url.V
 				QuerySamenessGroup:
 			default:
 				return nil,
-					fmt.Errorf("%s: invalid query parameter key %q in query %q: supported keys: %s,%s,%s", endpointLabel, key, queryRaw, QueryNamespace, QueryPeer, QueryPartition)
+					fmt.Errorf("%s: invalid query parameter key %q in query %q: supported keys: %s,%s,%s,%s", endpointLabel, key, queryRaw, QueryNamespace, QueryPeer, QueryPartition, QuerySamenessGroup)
 			}
 		}
 	}
diff --git a/dependency/health_service_test.go b/dependency/health_service_test.go
index cc55b22f8..677b836b9 100644
--- a/dependency/health_service_test.go
+++ b/dependency/health_service_test.go
@@ -60,7 +60,7 @@ func TestNewHealthServiceQuery(t *testing.T) {
 				tenancyHelper.AppendTenancyInfo("invalid query param (unsupported key)", tenancy),
 				"name?unsupported=test",
 				nil,
-				fmt.Errorf(`health.service: invalid query parameter key "unsupported" in query "unsupported=test": supported keys: ns,peer,partition`),
+				fmt.Errorf(`health.service: invalid query parameter key "unsupported" in query "unsupported=test": supported keys: ns,peer,partition,sameness-group`),
 			},
 			testCase{
 				tenancyHelper.AppendTenancyInfo("name", tenancy),
@@ -758,9 +758,9 @@ func TestHealthServiceQuery_Fetch_SamenessGroup(t *testing.T) {
 		t.Fatal(err)
 	}
 
-        // Assert that the service instance returned is from the first listed partition.
-        // This is expected because the service is healthy so it shouldn't failover
-        // to other partitions.
+	// Assert that the service instance returned is from the first listed partition.
+	// This is expected because the service is healthy so it shouldn't failover
+	// to other partitions.
 	healthServices := svcs.([]*HealthService)
 	require.True(t, len(healthServices) == 1)
 	require.Equal(t, "node"+partitionOne, healthServices[0].Node)
@@ -803,7 +803,7 @@ func TestHealthServiceQuery_Fetch_SamenessGroup(t *testing.T) {
 		// Assert - verify the results
 		expectedResult := []*HealthService{
 			{
-                                 // The instance should now be from the failover partition.
+				// The instance should now be from the failover partition.
 				Node:                nodeTwo,
 				NodeAddress:         testConsul.Config.Bind,
 				ServiceMeta:         map[string]string{},