diff --git a/.readthedocs.yml b/.readthedocs.yml
index 2435aac483..037b2ed597 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -15,6 +15,13 @@ build:
   jobs:
     post_create_environment:
       - npm install -g @mermaid-js/mermaid-cli
+    pre_install:
+    # pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7
+    # pip==23.3 breaks dependency resolution
+      - python -m pip install -U "pip>=21.2,<23.2"
+    # These are technically installation steps, due to RTD's limit we need to inject the installation earlier.
+      - python -m pip install --upgrade --no-cache-dir sphinx readthedocs-sphinx-ext
+      - python -m pip install --upgrade --upgrade-strategy only-if-needed --no-cache-dir .[docs,test]
     pre_build:
       - pip freeze
       - python -m sphinx -WETan -j auto -D language=en -b linkcheck -d _build/doctrees docs/source _build/linkcheck
@@ -30,10 +37,10 @@ sphinx:
 # configuration: mkdocs.yml
 
 # Optionally set the version of Python and requirements required to build your docs
-python:
-  install:
-    - method: pip
-      path: .
-      extra_requirements:
-        - docs
-        - test
+# python:
+#   install:
+#     - method: pip
+#       path: .
+#       extra_requirements:
+#         - docs
+#         - test
diff --git a/Makefile b/Makefile
index a300c3167e..03f37573de 100644
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,9 @@ package: clean install
 	python -m pip install build && python -m build
 
 install-test-requirements:
+# pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7
+# pip==23.3 breaks dependency resolution
+	python -m pip install -U "pip>=21.2,<23.2"
 	pip install .[test]
 
 install-pre-commit: install-test-requirements
diff --git a/features/environment.py b/features/environment.py
index ea51cc9a56..b648767a0f 100644
--- a/features/environment.py
+++ b/features/environment.py
@@ -104,8 +104,8 @@ def _setup_minimal_env(context):
             "install",
             "-U",
             # pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7
-            "pip>=21.2,<23.2; python_version < '3.8'",
-            "pip>=21.2; python_version >= '3.8'",
+            # pip==23.3 breaks dependency resolution
+            "pip>=21.2,<23.2",
         ],
         env=context.env,
     )