diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43ad52bafa70bf11668e8d703dac76f540789d81..686e9926cbb29184b1a6839057f2b2e3eb6bdc17 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,7 +64,7 @@ Mypy:
 
 Documentation:
   script:
-  - EXTRA_INSTALL="pyopencl"
+  - EXTRA_INSTALL="pyopencl sphinx-autodoc-typehints"
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh
   - ./.ci-support/fix-code-for-docs.sh
   - ". ./build-docs.sh"
diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml
index 9f5f9b9151529b0e2dc8763a37c9de3a9f320fab..7c34e94ae8a63f1374259a9f84203e1b4edb4785 100644
--- a/.test-conda-env-py3.yml
+++ b/.test-conda-env-py3.yml
@@ -10,3 +10,4 @@ dependencies:
 - mako
 - pyopencl
 - islpy
+- sphinx-autodoc-typehints