diff --git a/lint-configs/python/pyproject.toml b/lint-configs/python/pyproject.toml
new file mode 100644
index 0000000000..a232e186cc
--- /dev/null
+++ b/lint-configs/python/pyproject.toml
@@ -0,0 +1,23 @@
+[tool.black]
+line-length = 100
+skip_string_normalization = true
+target_version = ['py27', 'py36', 'py37', 'py38']
+include = '\.pyi?$'
+exclude = '''
+/(
+    \.eggs
+  | \.git
+  | \.hg
+  | \.mypy_cache
+  | \.tox
+  | \.venv
+  | _build
+  | buck-out
+  | build
+  | dist
+  | virtualenv
+  | virtualenv-py3
+  | virtualenv-st2client
+  | test_content_version
+)/
+
diff --git a/tox.ini b/tox.ini
index fb193b3449..c09d1f91e7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,6 +19,31 @@ deps = -r{toxinidir}/requirements.txt
        -e{toxinidir}/st2reactor
 
 # Python 3 tasks
+[testenv:py36-black]
+basepython = python3.6
+setenv = PYTHONPATH = {toxinidir}/external:{toxinidir}/st2common:{toxinidir}/st2api:{toxinidir}/st2actions:{toxinidir}/st2exporter:{toxinidir}/st2reactor:{toxinidir}/st2tests:{toxinidir}/contrib/runners/action_chain_runner:{toxinidir}/contrib/runners/local_runner:{toxinidir}/contrib/runners/python_runner:{toxinidir}/contrib/runners/http_runner:{toxinidir}/contrib/runners/noop_runner:{toxinidir}/contrib/runners/announcement_runner:{toxinidir}/contrib/runners/remote_runner:{toxinidir}/contrib/runners/remote_runner:{toxinidir}/contrib/runners/mistral_v2:{toxinidir}/contrib/runners/orquesta_runner:{toxinidir}/contrib/runners/inquirer_runner:{toxinidir}/contrib/runners/http_runner:{toxinidir}/contrib/runners/winrm_runner
+         VIRTUALENV_DIR = {envdir}
+passenv = NOSE_WITH_TIMER TRAVIS
+install_command = pip install -U --force-reinstall {opts} {packages}
+deps = virtualenv
+       -r{toxinidir}/requirements.txt
+       -e{toxinidir}/st2client
+       -e{toxinidir}/st2common
+       black
+commands =
+    black --config lint-configs/python/pyproject.toml st2api/
+    black --config lint-configs/python/pyproject.toml st2auth/
+    black --config lint-configs/python/pyproject.toml st2client/
+    black --config lint-configs/python/pyproject.toml st2common/
+    black --config lint-configs/python/pyproject.toml st2debug/
+    black --config lint-configs/python/pyproject.toml st2exporter/
+    black --config lint-configs/python/pyproject.toml st2reactor/
+    black --config lint-configs/python/pyproject.toml st2stream/
+    black --config lint-configs/python/pyproject.toml st2tests/
+    black --config lint-configs/python/pyproject.toml contrib/
+    black --config lint-configs/python/pyproject.toml tools/
+    black --config lint-configs/python/pyproject.toml scripts
+
 [testenv:py36-unit]
 basepython = python3.6
 setenv = PYTHONPATH = {toxinidir}/external:{toxinidir}/st2common:{toxinidir}/st2api:{toxinidir}/st2actions:{toxinidir}/st2exporter:{toxinidir}/st2reactor:{toxinidir}/st2tests:{toxinidir}/contrib/runners/action_chain_runner:{toxinidir}/contrib/runners/local_runner:{toxinidir}/contrib/runners/python_runner:{toxinidir}/contrib/runners/http_runner:{toxinidir}/contrib/runners/noop_runner:{toxinidir}/contrib/runners/announcement_runner:{toxinidir}/contrib/runners/remote_runner:{toxinidir}/contrib/runners/remote_runner:{toxinidir}/contrib/runners/mistral_v2:{toxinidir}/contrib/runners/orquesta_runner:{toxinidir}/contrib/runners/inquirer_runner:{toxinidir}/contrib/runners/http_runner:{toxinidir}/contrib/runners/winrm_runner