diff --git a/keystone/tests/unit/token/test_fernet_provider.py b/keystone/tests/unit/token/test_fernet_provider.py
index 655d615399..2bdd979a3d 100644
--- a/keystone/tests/unit/token/test_fernet_provider.py
+++ b/keystone/tests/unit/token/test_fernet_provider.py
@@ -31,7 +31,7 @@ from keystone.tests.unit import ksfixtures
 from keystone.tests.unit.ksfixtures import database
 from keystone.token.providers import common
 from keystone.token.providers import fernet
-from keystone.token.providers.fernet import token_formatters
+from keystone.token import token_formatters
 
 
 CONF = keystone.conf.CONF
diff --git a/keystone/token/providers/fernet/core.py b/keystone/token/providers/fernet/core.py
index 486a94229b..27bc0e81ed 100644
--- a/keystone/token/providers/fernet/core.py
+++ b/keystone/token/providers/fernet/core.py
@@ -18,7 +18,7 @@ import keystone.conf
 from keystone.federation import constants as federation_constants
 from keystone.i18n import _
 from keystone.token.providers import common
-from keystone.token.providers.fernet import token_formatters as tf
+from keystone.token import token_formatters as tf
 
 
 CONF = keystone.conf.CONF
diff --git a/keystone/token/providers/fernet/token_formatters.py b/keystone/token/token_formatters.py
similarity index 100%
rename from keystone/token/providers/fernet/token_formatters.py
rename to keystone/token/token_formatters.py
diff --git a/releasenotes/notes/token-formatter-ec58aba00fa83706.yaml b/releasenotes/notes/token-formatter-ec58aba00fa83706.yaml
new file mode 100644
index 0000000000..e4fd6359b2
--- /dev/null
+++ b/releasenotes/notes/token-formatter-ec58aba00fa83706.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    The token_formatter utility class has been moved from under fernet
+    to the default token directory. This is to allow for the reuse of
+    functionality with other token providers. Any deployments that are
+    specifically using the fernet utils may be affected and will need
+    to adjust accordingly.