diff --git a/gus/crawl.py b/gus/crawl.py
index 1f04fe45d9017adf7303da4b7a4dcc03281704f4..ed3873a15fa15ea71db27106d9d369e922de7d33 100644
--- a/gus/crawl.py
+++ b/gus/crawl.py
@@ -9,7 +9,13 @@ import pickle
import time
from urllib.parse import urljoin, uses_relative, uses_netloc
-import feedparser
+# TODO: this import breaks with Python 3.9, but all code that relies
+# on this code path is currently dead code, so for now I'm just
+# commenting out the import. It would be nice to make an actual
+# decision soon about whether or not feed-based updating is even
+# worth keeping around. If not, the dead code paths could simply
+# deleted, and GUS would get a bit simpler :)
+# import feedparser
import peewee
from . import constants
diff --git a/tests/gus/lib/test_gemini.py b/tests/gus/lib/test_gemini.py
index 17d47e084ab646085ffae39f5dc08ed48ca227aa..025cd81b07544799409d1c46140e32def3131a84 100644
--- a/tests/gus/lib/test_gemini.py
+++ b/tests/gus/lib/test_gemini.py
@@ -46,7 +46,10 @@
@pytest.mark.parametrize("test_input,expected_result", [
(["gemini://gus.guru", None, None], [True, "gemini://gus.guru", "gus.guru"]),
(["/bar", "gemini://gus.guru/foo", None], [False, None, None]),
+ (["/bar", "gemini://gus.guru/foo/", None], [False, None, None]),
(["/bar", "gemini://gus.guru/foo", "gus.guru"], [True, "gemini://gus.guru/bar", "gus.guru"]),
+ (["/bar", "gemini://gus.guru/foo/", "gus.guru"], [True, "gemini://gus.guru/bar", "gus.guru"]),
+ (["bar", "gemini://gus.guru/foo", "gus.guru"], [True, "gemini://gus.guru/bar", "gus.guru"]),
(["bar", "gemini://gus.guru/foo/", "gus.guru"], [True, "gemini://gus.guru/foo/bar", "gus.guru"]),
# (["bar", "gemini://gus.guru/foo", "gus.guru"], [True, "gemini://gus.guru/foo/bar", "gus.guru"]),
(["//foo.com", None, None], [True, "gemini://foo.com", "foo.com"]),