diff --git a/tests/test_tutorial/test_additional_status_codes/test_tutorial001.py b/tests/test_tutorial/test_additional_status_codes/test_tutorial001.py
index c382cb5fe..b304f7015 100644
--- a/tests/test_tutorial/test_additional_status_codes/test_tutorial001.py
+++ b/tests/test_tutorial/test_additional_status_codes/test_tutorial001.py
@@ -1,17 +1,35 @@
+import importlib
+
+import pytest
 from fastapi.testclient import TestClient
 
-from docs_src.additional_status_codes.tutorial001 import app
+from ...utils import needs_py39, needs_py310
+
+
+@pytest.fixture(
+    name="client",
+    params=[
+        "tutorial001",
+        pytest.param("tutorial001_py310", marks=needs_py310),
+        "tutorial001_an",
+        pytest.param("tutorial001_an_py39", marks=needs_py39),
+        pytest.param("tutorial001_an_py310", marks=needs_py310),
+    ],
+)
+def get_client(request: pytest.FixtureRequest):
+    mod = importlib.import_module(f"docs_src.additional_status_codes.{request.param}")
 
-client = TestClient(app)
+    client = TestClient(mod.app)
+    return client
 
 
-def test_update():
+def test_update(client: TestClient):
     response = client.put("/items/foo", json={"name": "Wrestlers"})
     assert response.status_code == 200, response.text
     assert response.json() == {"name": "Wrestlers", "size": None}
 
 
-def test_create():
+def test_create(client: TestClient):
     response = client.put("/items/red", json={"name": "Chillies"})
     assert response.status_code == 201, response.text
     assert response.json() == {"name": "Chillies", "size": None}
diff --git a/tests/test_tutorial/test_additional_status_codes/test_tutorial001_an.py b/tests/test_tutorial/test_additional_status_codes/test_tutorial001_an.py
deleted file mode 100644
index 2cb2bb993..000000000
--- a/tests/test_tutorial/test_additional_status_codes/test_tutorial001_an.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from fastapi.testclient import TestClient
-
-from docs_src.additional_status_codes.tutorial001_an import app
-
-client = TestClient(app)
-
-
-def test_update():
-    response = client.put("/items/foo", json={"name": "Wrestlers"})
-    assert response.status_code == 200, response.text
-    assert response.json() == {"name": "Wrestlers", "size": None}
-
-
-def test_create():
-    response = client.put("/items/red", json={"name": "Chillies"})
-    assert response.status_code == 201, response.text
-    assert response.json() == {"name": "Chillies", "size": None}
diff --git a/tests/test_tutorial/test_additional_status_codes/test_tutorial001_an_py310.py b/tests/test_tutorial/test_additional_status_codes/test_tutorial001_an_py310.py
deleted file mode 100644
index c7660a392..000000000
--- a/tests/test_tutorial/test_additional_status_codes/test_tutorial001_an_py310.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import pytest
-from fastapi.testclient import TestClient
-
-from ...utils import needs_py310
-
-
-@pytest.fixture(name="client")
-def get_client():
-    from docs_src.additional_status_codes.tutorial001_an_py310 import app
-
-    client = TestClient(app)
-    return client
-
-
-@needs_py310
-def test_update(client: TestClient):
-    response = client.put("/items/foo", json={"name": "Wrestlers"})
-    assert response.status_code == 200, response.text
-    assert response.json() == {"name": "Wrestlers", "size": None}
-
-
-@needs_py310
-def test_create(client: TestClient):
-    response = client.put("/items/red", json={"name": "Chillies"})
-    assert response.status_code == 201, response.text
-    assert response.json() == {"name": "Chillies", "size": None}
diff --git a/tests/test_tutorial/test_additional_status_codes/test_tutorial001_an_py39.py b/tests/test_tutorial/test_additional_status_codes/test_tutorial001_an_py39.py
deleted file mode 100644
index 303c5dbae..000000000
--- a/tests/test_tutorial/test_additional_status_codes/test_tutorial001_an_py39.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import pytest
-from fastapi.testclient import TestClient
-
-from ...utils import needs_py39
-
-
-@pytest.fixture(name="client")
-def get_client():
-    from docs_src.additional_status_codes.tutorial001_an_py39 import app
-
-    client = TestClient(app)
-    return client
-
-
-@needs_py39
-def test_update(client: TestClient):
-    response = client.put("/items/foo", json={"name": "Wrestlers"})
-    assert response.status_code == 200, response.text
-    assert response.json() == {"name": "Wrestlers", "size": None}
-
-
-@needs_py39
-def test_create(client: TestClient):
-    response = client.put("/items/red", json={"name": "Chillies"})
-    assert response.status_code == 201, response.text
-    assert response.json() == {"name": "Chillies", "size": None}
diff --git a/tests/test_tutorial/test_additional_status_codes/test_tutorial001_py310.py b/tests/test_tutorial/test_additional_status_codes/test_tutorial001_py310.py
deleted file mode 100644
index 02f2e188c..000000000
--- a/tests/test_tutorial/test_additional_status_codes/test_tutorial001_py310.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import pytest
-from fastapi.testclient import TestClient
-
-from ...utils import needs_py310
-
-
-@pytest.fixture(name="client")
-def get_client():
-    from docs_src.additional_status_codes.tutorial001_py310 import app
-
-    client = TestClient(app)
-    return client
-
-
-@needs_py310
-def test_update(client: TestClient):
-    response = client.put("/items/foo", json={"name": "Wrestlers"})
-    assert response.status_code == 200, response.text
-    assert response.json() == {"name": "Wrestlers", "size": None}
-
-
-@needs_py310
-def test_create(client: TestClient):
-    response = client.put("/items/red", json={"name": "Chillies"})
-    assert response.status_code == 201, response.text
-    assert response.json() == {"name": "Chillies", "size": None}