diff --git a/vault/token_store.go b/vault/token_store.go
index 21824f2235308..c39a608c9f4dd 100644
--- a/vault/token_store.go
+++ b/vault/token_store.go
@@ -132,7 +132,7 @@ func NewTokenStore(c *Core, config *logical.BackendConfig) (*TokenStore, error)
 			},
 
 			&framework.Path{
-				Pattern: "lookup-accessor$",
+				Pattern: "lookup-accessor/(?P<accessor>.+)",
 
 				Fields: map[string]*framework.FieldSchema{
 					"accessor": &framework.FieldSchema{
diff --git a/vault/token_store_test.go b/vault/token_store_test.go
index e2500873be63c..00555de34a636 100644
--- a/vault/token_store_test.go
+++ b/vault/token_store_test.go
@@ -58,8 +58,7 @@ func TestTokenStore_HandleRequest_LookupAccessor(t *testing.T) {
 		t.Fatalf("err: %s", err)
 	}
 
-	req := logical.TestRequest(t, logical.UpdateOperation, "lookup-accessor")
-	req.Data["accessor"] = out.Accessor
+	req := logical.TestRequest(t, logical.UpdateOperation, "lookup-accessor/"+out.Accessor)
 
 	resp, err := ts.HandleRequest(req)
 	if err != nil {