diff --git a/docs/plugin_hooks.rst b/docs/plugin_hooks.rst
index da49811a..ad4a70f8 100644
--- a/docs/plugin_hooks.rst
+++ b/docs/plugin_hooks.rst
@@ -967,11 +967,14 @@ Here is an example that validates required plugin configuration. The server will
 
     from datasette.utils import StartupError
 
+
     @hookimpl
     def startup(datasette):
         config = datasette.plugin_config("my-plugin") or {}
         if "required-setting" not in config:
-            raise StartupError("my-plugin requires setting required-setting")
+            raise StartupError(
+                "my-plugin requires setting required-setting"
+            )
 
 You can also return an async function, which will be awaited on startup. Use this option if you need to execute any database queries, for example this function which creates the ``my_table`` database table if it does not yet exist:
 
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 36d90e82..6cdfd924 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -4,7 +4,7 @@ from .fixtures import (
     EXPECTED_PLUGINS,
 )
 from datasette.app import SETTINGS
-from datasette.plugins import DEFAULT_PLUGINS
+from datasette.plugins import DEFAULT_PLUGINS, pm
 from datasette.cli import cli, serve
 from datasette.version import __version__
 from datasette.utils import tilde_encode
@@ -326,8 +326,16 @@ def test_startup_error_from_plugin_is_click_exception(tmp_path):
             "/",
         ],
     )
-    assert result.exit_code == 1
-    assert "Error: boom" in result.output
+    try:
+        assert result.exit_code == 1
+        assert "Error: boom" in result.output
+    finally:
+        # Cleanup: Unregister the plugin to avoid test isolation issues
+        to_unregister = [
+            p for p in pm.get_plugins() if p.__name__ == "startup_error.py"
+        ]
+        if to_unregister:
+            pm.unregister(to_unregister[0])
 
 
 def test_setting_type_validation():