diff --git a/.editorconfig b/.editorconfig
index bcac89e0c837e824b582fe82c6b1e32668716258..c073704a5d2ee71122deadd40a043260b63c26c0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,15 +15,6 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8
 
-# Python files
-[*.py]
-indent_size = 4
-# isort plugin configuration
-known_first_party = invenio_utilities_tuw
-multi_line_output = 2
-default_section = THIRDPARTY
-skip = .eggs
-
 # RST files (used by sphinx)
 [*.rst]
 indent_size = 4
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/MANIFEST.in b/MANIFEST.in
index ac43375f70795028f49c7ec03c3f66c0b8fecec8..6bd34b2180970f4f877e7670fb78f9d74ba1d506 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -18,6 +18,7 @@
 exclude .gitlab-ci.yml
 exclude sonar-project.properties
 
+include .git-blame-ignore-revs
 include .dockerignore
 include .editorconfig
 include .tx/config
diff --git a/docs/conf.py b/docs/conf.py
index f0499db51fb53f047f5606742ba6cc1f88153600..8dc911e4375e90dd5102381fdc7fe6d771406ce1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -8,10 +8,10 @@
 
 """Sphinx configuration."""
 
-from invenio_utilities_tuw import __version__
-
 import sphinx.environment
 
+from invenio_utilities_tuw import __version__
+
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index 97614cf5b8f7f2bb2748c21fe949d512352d870c..0000000000000000000000000000000000000000
--- a/pytest.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2020 - 2021 TU Wien.
-#
-# Invenio-Utilities-TUW is free software; you can redistribute it and/or
-# modify it under the terms of the MIT License; see LICENSE file for more
-# details.
-
-[pytest]
-addopts = --isort --pydocstyle --pycodestyle --doctest-glob="*.rst" --doctest-modules --cov=invenio_utilities_tuw --cov-report=term-missing
-testpaths = docs tests invenio_utilities_tuw
diff --git a/setup.cfg b/setup.cfg
index 98a5503f3423edd1b3406dc7b2deba27a24d1ecc..4c48f55d417d9555b1935f0626a9bc32de3b77ba 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -39,6 +39,7 @@ install_requires =
 
 [options.extras_require]
 tests =
+    pytest-black>=0.3.0,<0.3.10
     pytest-invenio>=1.4.0
     Sphinx>=4.2.0
 # Kept for backwards compatibility
@@ -90,10 +91,8 @@ max-line-length = 88
 extend-ignore = E203,E731
 
 [isort]
-multi_line_output = 3
-include_trailing_comma = True
-force_grid_wrap = 0
-use_parentheses = True
-ensure_newline_before_comments = True
-line_length = 88
+profile=black
 
+[tool:pytest]
+addopts = --black --isort --pydocstyle --doctest-glob="*.rst" --doctest-modules --cov=invenio_utilities_tuw --cov-report=term-missing
+testpaths = docs tests invenio_utilities_tuw