diff --git a/.gitignore b/.gitignore
index 90494eeaa1..f7645731f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,7 @@ package-lock.json
 
 /.dmypy.json
 
-# Dockerfiles generated for CircleCI
+# Dockerfiles generated for continuous integration
 /tools/ci/images
 
 # Generated i18n data
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
index a6d869af31..748642c0a9 100644
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -8,7 +8,7 @@
     {% if pagename in ["production/postgresql", "production/video-calls"] and release.endswith('+git') %}
     {#
     # This page doesn't exist in the stable documentation yet.
-    # This temporary workaround prevents CircleCI failure and should be removed after the next release.
+    # This temporary workaround prevents test failures and should be removed after the next release.
     #}
     <div class="admonition warning">
         <p class="first admonition-title">Warning</p>
diff --git a/docs/testing/linters.md b/docs/testing/linters.md
index b596a73e34..47440e9339 100644
--- a/docs/testing/linters.md
+++ b/docs/testing/linters.md
@@ -51,7 +51,7 @@ note are:
 * `--skip` and `--only`: Only run certain linters.
 * `-m`: Only check modified files.
 
-Finally, you can rely on our CircleCI setup to run linters for you,
+Finally, you can rely on our continuous integration setup to run linters for you,
 but it is good practice to run lint checks locally.
 
 ```eval_rst
diff --git a/tools/lib/provision_inner.py b/tools/lib/provision_inner.py
index b8a5cb82a6..1853bb72b4 100755
--- a/tools/lib/provision_inner.py
+++ b/tools/lib/provision_inner.py
@@ -296,7 +296,7 @@ def main(options: argparse.Namespace) -> int:
             run(["tools/setup/postgresql-init-dev-db"])
             if options.skip_dev_db_build:
                 # We don't need to build the manual development
-                # database on CircleCI for running tests, so we can
+                # database on continuous integration for running tests, so we can
                 # just leave it as a template db and save a minute.
                 #
                 # Important: We don't write a digest as that would
diff --git a/tools/test-backend b/tools/test-backend
index 82bb072aff..233ec37cb5 100755
--- a/tools/test-backend
+++ b/tools/test-backend
@@ -376,7 +376,7 @@ def main() -> None:
         cov = coverage.Coverage(
             data_suffix="", config_file="tools/coveragerc", concurrency="multiprocessing"
         )
-        # Do not clean .coverage file in CircleCi job so that coverage data can be uploaded.
+        # Do not clean .coverage file in continuous integration job so that coverage data can be uploaded.
         if not options.no_cov_cleanup:
             import atexit