diff --git a/testapp.go b/testapp.go
index ebe1e48..c143dfa 100644
--- a/testapp.go
+++ b/testapp.go
@@ -83,16 +83,16 @@ func (testApp *TestApp) generateToken(tenant string, name string, scope []string
 	hmacSampleSecret := []byte(testApp.application.Config.GetString("ISLA_JWT_SECRET"))
 
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
-		"iss":    "http://isla.cyberinc.com",
-		"aud":    "http://isla.cyberinc.com",
-		"foo":    "bar",
-		"iat":    time.Now().Unix(),
-		"exp":    time.Now().Add(time.Minute * 60).Unix(), // Expires in 1 hour
-		"tenant": tenant,
-		"user":   "00000000-0000-0000-0000-0000000000FA",
-		"name":   name,
-		"scope":  scope,
-		"admin":  admin,
+		"iss":      "http://isla.cyberinc.com",
+		"aud":      "http://isla.cyberinc.com",
+		"foo":      "bar",
+		"iat":      time.Now().Unix(),
+		"exp":      time.Now().Add(time.Minute * 60).Unix(), // Expires in 1 hour
+		"tenantId": "00000000-0000-0000-0000-0000000094CD",
+		"userId":   "00000000-0000-0000-0000-0000000000FA",
+		"name":     name,
+		"scope":    scope,
+		"admin":    admin,
 	})
 
 	// Sign and get the complete encoded token as a string using the secret