diff --git a/builtin/logical/pki/path_issue.go b/builtin/logical/pki/path_issue.go
index f6c8ca505f..d1239c87dd 100644
--- a/builtin/logical/pki/path_issue.go
+++ b/builtin/logical/pki/path_issue.go
@@ -14,7 +14,7 @@ import (
 
 func pathIssue(b *backend) *framework.Path {
 	return &framework.Path{
-		Pattern: `issue/(?P<role>\w+)`,
+		Pattern: `issue/(?P<role>\w[\w-]+\w)`,
 		Fields: map[string]*framework.FieldSchema{
 			"role": &framework.FieldSchema{
 				Type: framework.TypeString,
diff --git a/builtin/logical/pki/path_roles.go b/builtin/logical/pki/path_roles.go
index 524e01cfce..46f415031b 100644
--- a/builtin/logical/pki/path_roles.go
+++ b/builtin/logical/pki/path_roles.go
@@ -11,7 +11,7 @@ import (
 
 func pathRoles(b *backend) *framework.Path {
 	return &framework.Path{
-		Pattern: "roles/(?P<name>\\w+)",
+		Pattern: `roles/(?P<name>\w[\w-]+\w)`,
 		Fields: map[string]*framework.FieldSchema{
 			"name": &framework.FieldSchema{
 				Type:        framework.TypeString,