diff --git a/datasette/app.py b/datasette/app.py
index 957ced7c..018a8d5b 100644
--- a/datasette/app.py
+++ b/datasette/app.py
@@ -646,7 +646,7 @@ class Datasette:
                 "is_memory": d.is_memory,
                 "hash": d.hash,
             }
-            for name, d in sorted(self.databases.items(), key=lambda p: p[1].name)
+            for name, d in self.databases.items()
             if name != "_internal"
         ]
 
diff --git a/tests/fixtures.py b/tests/fixtures.py
index 5730c1bf..2690052a 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -126,7 +126,8 @@ def make_app_client(
             for extra_filename, extra_sql in extra_databases.items():
                 extra_filepath = os.path.join(tmpdir, extra_filename)
                 sqlite3.connect(extra_filepath).executescript(extra_sql)
-                files.append(extra_filepath)
+                # Insert at start to help test /-/databases ordering:
+                files.insert(0, extra_filepath)
         os.chdir(os.path.dirname(filepath))
         config = config or {}
         for key, value in {
diff --git a/tests/test_api.py b/tests/test_api.py
index 078aad35..3b789bb7 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -1918,7 +1918,7 @@ def test_database_with_space_in_name(app_client_two_attached_databases, path):
 
 def test_common_prefix_database_names(app_client_conflicting_database_names):
     # https://github.com/simonw/datasette/issues/597
-    assert ["fixtures", "foo", "foo-bar"] == [
+    assert ["foo-bar", "foo", "fixtures"] == [
         d["name"]
         for d in app_client_conflicting_database_names.get("/-/databases.json").json
     ]
diff --git a/tests/test_html.py b/tests/test_html.py
index 4f2cc8ad..fd60cdc9 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -29,11 +29,11 @@ def test_homepage(app_client_two_attached_databases):
     )
     # Should be two attached databases
     assert [
-        {"href": "/fixtures", "text": "fixtures"},
         {"href": r"/extra%20database", "text": "extra database"},
+        {"href": "/fixtures", "text": "fixtures"},
     ] == [{"href": a["href"], "text": a.text.strip()} for a in soup.select("h2 a")]
-    # The first attached database should show count text and attached tables
-    h2 = soup.select("h2")[1]
+    # Database should show count text and attached tables
+    h2 = soup.select("h2")[0]
     assert "extra database" == h2.text.strip()
     counts_p, links_p = h2.find_all_next("p")[:2]
     assert (