diff --git a/doc/en/fixture.rst b/doc/en/fixture.rst
index 028786f65..50bc9ee8e 100644
--- a/doc/en/fixture.rst
+++ b/doc/en/fixture.rst
@@ -2228,7 +2228,6 @@ file:
     # content of conftest.py
 
     import os
-    import shutil
     import tempfile
 
     import pytest
@@ -2236,12 +2235,11 @@ file:
 
     @pytest.fixture
     def cleandir():
-        old_cwd = os.getcwd()
-        newpath = tempfile.mkdtemp()
-        os.chdir(newpath)
-        yield
-        os.chdir(old_cwd)
-        shutil.rmtree(newpath)
+        with tempfile.TemporaryDirectory() as newpath:
+            old_cwd = os.getcwd()
+            os.chdir(newpath)
+            yield
+            os.chdir(old_cwd)
 
 and declare its use in a test module via a ``usefixtures`` marker:
 
diff --git a/testing/test_assertrewrite.py b/testing/test_assertrewrite.py
index cba03406e..f7d9d62ef 100644
--- a/testing/test_assertrewrite.py
+++ b/testing/test_assertrewrite.py
@@ -1395,12 +1395,10 @@ class TestEarlyRewriteBailout:
             **{
                 "test_setup_nonexisting_cwd.py": """\
                     import os
-                    import shutil
                     import tempfile
 
-                    d = tempfile.mkdtemp()
-                    os.chdir(d)
-                    shutil.rmtree(d)
+                    with tempfile.TemporaryDirectory() as d:
+                        os.chdir(d)
                 """,
                 "test_test.py": """\
                     def test():