diff --git a/Makefile b/Makefile
index ba3bb53a1..6fe3023d3 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ requirements:
 # Style checks
 # ============
 
-style: isort autopep8 yapf  ## Format code
+style: isort autopep8  ## Format code
 
 isort:
 	$(PIPENV) run isort -y -rc lutris
@@ -77,21 +77,16 @@ isort:
 autopep8:
 	$(PIPENV) run autopep8 --in-place --recursive --ignore E402 setup.py lutris
 
-yapf:
-	$(PIPENV) run yapf --style .yapf --recursive -i lutris
 
 # ===============
 # Static analysis
 # ===============
 
-check: isort-check yapf-check flake8 pylint
+check: isort-check flake8 pylint
 
 isort-check:
 	$(PIPENV) run isort -c -rc lutris
 
-yapf-check:
-	$(PIPENV) run yapf --style .yapf --recursive --diff lutris
-
 flake8:
 	$(PIPENV) run flake8 lutris
 
diff --git a/Pipfile b/Pipfile
index 671526e2c..887538269 100644
--- a/Pipfile
+++ b/Pipfile
@@ -5,7 +5,6 @@ isort = '>=4.3'
 pycodestyle = '>=2.5'
 PyGObject-stubs = '*'
 pylint = '==2.4.4'
-yapf = '>=0.30'
 pipenv-to-requirements = "*"
 
 [packages]
diff --git a/Pipfile.lock b/Pipfile.lock
index 9be4bf238..cf75abe7d 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -461,14 +461,6 @@
             ],
             "index": "pypi",
             "version": "==1.12.1"
-        },
-        "yapf": {
-            "hashes": [
-                "sha256:3000abee4c28daebad55da6c85f3cd07b8062ce48e2e9943c8da1b9667d48427",
-                "sha256:3abf61ba67cf603069710d30acbc88cfe565d907e16ad81429ae90ce9651e0c9"
-            ],
-            "index": "pypi",
-            "version": "==0.30.0"
         }
     }
 }
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 32293bbcf..de3bed61d 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -34,4 +34,3 @@ six==1.14.0
 virtualenv-clone==0.5.4
 virtualenv==20.0.18
 wrapt==1.11.2
-yapf==0.30.0