diff --git a/test/gateway.go b/test/gateway.go
index <HASH>..<HASH> 100644
--- a/test/gateway.go
+++ b/test/gateway.go
@@ -5,27 +5,18 @@ package test
 
 import jwt "github.com/dgrijalva/jwt-go"
 
-type location struct {
-	Longitude float64 `json:"lng"`
-	Latitude  float64 `json:"lat"`
-}
-
 // GatewayClaims creates a jwt.Claims that represents the gateway
-func GatewayClaims(id, frequencyPlan string, lat, lng float64, locationPublic, statusPublic bool) jwt.Claims {
+func GatewayClaims(id, locationPublic, statusPublic bool) jwt.Claims {
 	return jwt.MapClaims{
 		"iss":             Issuer,
 		"sub":             id,
-		"frequency_plan":  frequencyPlan,
+		"type":            "gateway",
 		"location_public": locationPublic,
 		"status_public":   statusPublic,
-		"location": location{
-			Longitude: lng,
-			Latitude:  lat,
-		},
 	}
 }
 
 // GatewayToken creates a token that is singed by PrivateKey, and has the GatewayClaims
-func GatewayToken(id, frequencyPlan string, lat, lng float64, locationPublic, statusPublic bool) string {
-	return TokenFromClaims(GatewayClaims(id, frequencyPlan, lat, lng, locationPublic, statusPublic))
+func GatewayToken(id, locationPublic, statusPublic bool) string {
+	return TokenFromClaims(GatewayClaims(id, locationPublic, statusPublic))
 }
Reduce the number of things in gateway claims