diff --git a/.buildkite/postgres-config.yaml b/.buildkite/postgres-config.yaml
index a35fec394d..dcf72cfda0 100644
--- a/.buildkite/postgres-config.yaml
+++ b/.buildkite/postgres-config.yaml
@@ -1,7 +1,7 @@
 # Configuration file used for testing the 'synapse_port_db' script.
 # Tells the script to connect to the postgresql database that will be available in the
 # CI's Docker setup at the point where this file is considered.
-server_name: "test"
+server_name: "localhost:8080"
 
 signing_key_path: "/src/.buildkite/test.signing.key"
 
diff --git a/.buildkite/sqlite-config.yaml b/.buildkite/sqlite-config.yaml
index 635b921764..5276aaff03 100644
--- a/.buildkite/sqlite-config.yaml
+++ b/.buildkite/sqlite-config.yaml
@@ -1,7 +1,7 @@
 # Configuration file used for testing the 'synapse_port_db' script.
 # Tells the 'update_database' script to connect to the test SQLite database to upgrade its
 # schema and run background updates on it.
-server_name: "test"
+server_name: "localhost:8080"
 
 signing_key_path: "/src/.buildkite/test.signing.key"
 
diff --git a/synapse/storage/database.py b/synapse/storage/database.py
index be36c1b829..bd515d70d2 100644
--- a/synapse/storage/database.py
+++ b/synapse/storage/database.py
@@ -256,8 +256,6 @@ class Database(object):
                 self._check_safe_to_upsert,
             )
 
-        self.rand = random.SystemRandom()
-
     @defer.inlineCallbacks
     def _check_safe_to_upsert(self):
         """