diff --git a/test/connection_test.dart b/test/connection_test.dart
index d799e368..710ab2fd 100644
--- a/test/connection_test.dart
+++ b/test/connection_test.dart
@@ -12,9 +12,7 @@ import 'docker.dart';
 void main() {
   withPostgresServer('connection state', (server) {
     test('pre-open failure', () async {
-      final conn = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      final conn = await server.newPostgreSQLConnection();
       await expectLater(
           () => conn.query('SELECT 1;'),
           throwsA(isA<Exception>().having(
@@ -30,9 +28,7 @@ void main() {
     });
 
     test('pre-open failure with transaction', () async {
-      final conn = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      final conn = await server.newPostgreSQLConnection();
       await expectLater(
           () => conn.transaction((_) async {}),
           throwsA(isA<Exception>().having(
@@ -47,9 +43,7 @@ void main() {
     });
 
     test('post-close failure', () async {
-      final conn = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      final conn = await server.newPostgreSQLConnection();
       await conn.open();
       final rs = await conn.query('SELECT 1');
       expect(rs.first.first, 1);
@@ -65,9 +59,7 @@ void main() {
     });
 
     test('reopen closed connection', () async {
-      final conn = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      final conn = await server.newPostgreSQLConnection();
       await conn.open();
       final rs = await conn.query('SELECT 1');
       expect(rs.first.first, 1);
@@ -84,12 +76,7 @@ void main() {
 
     test('Connecting with ReplicationMode.none uses Extended Query Protocol',
         () async {
-      final conn = PostgreSQLConnection(
-        'localhost',
-        await server.port,
-        'dart_test',
-        username: 'dart',
-        password: 'dart',
+      final conn = await server.newPostgreSQLConnection(
         replicationMode: ReplicationMode.none,
       );
 
@@ -100,12 +87,7 @@ void main() {
     });
 
     test('Connect with logical ReplicationMode.logical', () async {
-      final conn = PostgreSQLConnection(
-        'localhost',
-        await server.port,
-        'dart_test',
-        username: 'replication',
-        password: 'replication',
+      final conn = await server.newPostgreSQLConnection(
         replicationMode: ReplicationMode.logical,
       );
 
@@ -115,12 +97,7 @@ void main() {
     });
 
     test('IDENTIFY_SYSTEM returns system information', () async {
-      final conn = PostgreSQLConnection(
-        'localhost',
-        await server.port,
-        'dart_test',
-        username: 'replication',
-        password: 'replication',
+      final conn = await server.newPostgreSQLConnection(
         replicationMode: ReplicationMode.logical,
       );
 
@@ -149,7 +126,7 @@ void main() {
     //       settings in the pg_hba.conf
   });
 
-  withPostgresServer('Connection lifecycle', (server) {
+  withPostgresServer('Connection lifecycle', initSqls: oldSchemaInit, (server) {
     late PostgreSQLConnection conn;
 
     tearDown(() async {
@@ -157,8 +134,7 @@ void main() {
     });
 
     test('Connect with md5 or scram-sha-256 auth required', () async {
-      conn = PostgreSQLConnection('localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      conn = await server.newPostgreSQLConnection();
 
       await conn.open();
 
@@ -166,8 +142,7 @@ void main() {
     });
 
     test('SSL Connect with md5 or scram-sha-256 auth required', () async {
-      conn = PostgreSQLConnection('localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart', useSSL: true);
+      conn = await server.newPostgreSQLConnection(useSSL: true);
 
       await conn.open();
 
@@ -301,7 +276,8 @@ void main() {
     });
   });
 
-  withPostgresServer('Successful queries over time', (server) {
+  withPostgresServer('Successful queries over time', initSqls: oldSchemaInit,
+      (server) {
     late PostgreSQLConnection conn;
 
     setUp(() async {
@@ -377,7 +353,8 @@ void main() {
     });
   });
 
-  withPostgresServer('Unintended user-error situations', (server) {
+  withPostgresServer('Unintended user-error situations',
+      initSqls: oldSchemaInit, (server) {
     late PostgreSQLConnection conn;
     Future? openFuture;
 
@@ -430,8 +407,7 @@ void main() {
 
     test('SSL Starting transaction while opening connection triggers error',
         () async {
-      conn = PostgreSQLConnection('localhost', await server.port, 'dart_test',
-          username: 'darttrust', useSSL: true);
+      conn = await server.newPostgreSQLConnection(useSSL: true);
       openFuture = conn.open();
 
       try {
@@ -476,8 +452,7 @@ void main() {
 
     test('A query error maintains connectivity, allows future queries',
         () async {
-      conn = PostgreSQLConnection('localhost', await server.port, 'dart_test',
-          username: 'darttrust');
+      conn = await server.newPostgreSQLConnection();
       await conn.open();
 
       await conn.execute('CREATE TEMPORARY TABLE t (i int unique)');
@@ -495,8 +470,7 @@ void main() {
     test(
         'A query error maintains connectivity, continues processing pending queries',
         () async {
-      conn = PostgreSQLConnection('localhost', await server.port, 'dart_test',
-          username: 'darttrust');
+      conn = await server.newPostgreSQLConnection();
       await conn.open();
 
       await conn.execute('CREATE TEMPORARY TABLE t (i int unique)');
@@ -538,8 +512,7 @@ void main() {
     test(
         'A query error maintains connectivity, continues processing pending transactions',
         () async {
-      conn = PostgreSQLConnection('localhost', await server.port, 'dart_test',
-          username: 'darttrust');
+      conn = await server.newPostgreSQLConnection();
       await conn.open();
 
       await conn.execute('CREATE TEMPORARY TABLE t (i int unique)');
@@ -570,8 +543,7 @@ void main() {
     test(
         'Building query throws error, connection continues processing pending queries',
         () async {
-      conn = PostgreSQLConnection('localhost', await server.port, 'dart_test',
-          username: 'darttrust');
+      conn = await server.newPostgreSQLConnection();
       await conn.open();
 
       // Make some async queries that'll exit the event loop, but then fail on a query that'll die early
@@ -765,9 +737,7 @@ void main() {
 
   withPostgresServer('connection', (server) {
     test('If connection is closed, do not allow .execute', () async {
-      final conn = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      final conn = await server.newPostgreSQLConnection();
       try {
         await conn.execute('SELECT 1');
         fail('unreachable');
@@ -777,9 +747,7 @@ void main() {
     });
 
     test('If connection is closed, do not allow .query', () async {
-      final conn = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      final conn = await server.newPostgreSQLConnection();
       try {
         await conn.query('SELECT 1');
         fail('unreachable');
@@ -789,9 +757,7 @@ void main() {
     });
 
     test('If connection is closed, do not allow .mappedResultsQuery', () async {
-      final conn = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      final conn = await server.newPostgreSQLConnection();
       try {
         await conn.mappedResultsQuery('SELECT 1');
         fail('unreachable');
@@ -803,9 +769,7 @@ void main() {
     test(
         'Queue size, should be 0 on open, >0 if queries added and 0 again after queries executed',
         () async {
-      final conn = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      final conn = await server.newPostgreSQLConnection();
       await conn.open();
       expect(conn.queueSize, 0);
 
diff --git a/test/decode_test.dart b/test/decode_test.dart
index f8a907f3..5e901b21 100644
--- a/test/decode_test.dart
+++ b/test/decode_test.dart
@@ -11,9 +11,7 @@ void main() {
   withPostgresServer('decode', (server) {
     late PostgreSQLConnection connection;
     setUp(() async {
-      connection = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      connection = await server.newPostgreSQLConnection();
       await connection.open();
 
       await connection.execute('''
diff --git a/test/docker.dart b/test/docker.dart
index 66ca4475..cd064e37 100644
--- a/test/docker.dart
+++ b/test/docker.dart
@@ -4,6 +4,8 @@ import 'dart:io';
 import 'package:docker_process/containers/postgres.dart';
 import 'package:path/path.dart' as p;
 import 'package:postgres/postgres_v3_experimental.dart';
+import 'package:postgres/src/connection.dart';
+import 'package:postgres/src/replication.dart';
 import 'package:test/test.dart';
 
 class PostgresServer {
@@ -12,19 +14,36 @@ class PostgresServer {
 
   Future<int> get port => _port.future;
 
-  Future<PgEndpoint> dartTestEndpoint() async => PgEndpoint(
+  Future<PgEndpoint> get endpoint async => PgEndpoint(
         host: 'localhost',
-        database: 'dart_test',
-        username: 'dart',
-        password: 'dart',
+        database: 'postgres',
+        username: 'postgres',
+        password: 'postgres',
         port: await port,
       );
+
+  Future<PostgreSQLConnection> newPostgreSQLConnection({
+    bool useSSL = false,
+    ReplicationMode replicationMode = ReplicationMode.none,
+  }) async {
+    final e = await endpoint;
+    return PostgreSQLConnection(
+      e.host,
+      e.port,
+      e.database,
+      username: e.username,
+      password: e.password,
+      useSSL: useSSL,
+      replicationMode: replicationMode,
+    );
+  }
 }
 
 void withPostgresServer(
   String name,
-  void Function(PostgresServer server) fn,
-) {
+  void Function(PostgresServer server) fn, {
+  Iterable<String>? initSqls,
+}) {
   group(name, () {
     final server = PostgresServer();
 
@@ -36,6 +55,7 @@ void withPostgresServer(
         await _startPostgresContainer(
           port: port,
           containerName: containerName,
+          initSqls: initSqls ?? const <String>[],
         );
 
         server._containerName.complete(containerName);
@@ -67,6 +87,7 @@ Future<int> selectFreePort() async {
 Future<void> _startPostgresContainer({
   required int port,
   required String containerName,
+  required Iterable<String> initSqls,
 }) async {
   final isRunning = await _isPostgresContainerRunning(containerName);
   if (isRunning) {
@@ -95,8 +116,7 @@ Future<void> _startPostgresContainer({
   );
 
   // Setup the database to support all kind of tests
-  // see _setupDatabaseStatements definition for details
-  for (final stmt in _setupDatabaseStatements) {
+  for (final stmt in initSqls) {
     final args = [
       'psql',
       '-c',
@@ -131,10 +151,8 @@ Future<bool> _isPostgresContainerRunning(String containerName) async {
       .contains(containerName);
 }
 
-// This setup supports old and new test
-// This is setup is the same as the one from the old travis ci except for the
-// replication user which is a new addition.
-final _setupDatabaseStatements = <String>[
+/// This is setup is the same as the one from the old travis ci.
+const oldSchemaInit = <String>[
   // create testing database
   'create database dart_test;',
   // create dart user
@@ -144,6 +162,9 @@ final _setupDatabaseStatements = <String>[
   // create darttrust user
   'create user darttrust with createdb;',
   'grant all on database dart_test to darttrust;',
+];
+
+const replicationSchemaInit = <String>[
   // create replication user
   "create role replication with replication password 'replication' login;",
 ];
diff --git a/test/encoding_test.dart b/test/encoding_test.dart
index 8a2a503a..4c55f3df 100644
--- a/test/encoding_test.dart
+++ b/test/encoding_test.dart
@@ -14,8 +14,7 @@ late PostgreSQLConnection conn;
 void main() {
   withPostgresServer('Binary encoders', (server) {
     setUp(() async {
-      conn = PostgreSQLConnection('localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      conn = await server.newPostgreSQLConnection();
       await conn.open();
     });
 
diff --git a/test/error_handling_test.dart b/test/error_handling_test.dart
index 621c56b5..a0aa363c 100644
--- a/test/error_handling_test.dart
+++ b/test/error_handling_test.dart
@@ -1,4 +1,3 @@
-import 'package:postgres/postgres.dart';
 import 'package:test/test.dart';
 
 import 'docker.dart';
@@ -6,9 +5,7 @@ import 'docker.dart';
 void main() {
   withPostgresServer('error handling', (server) {
     test('Reports stacktrace correctly', () async {
-      final conn = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      final conn = await server.newPostgreSQLConnection();
       await conn.open();
       addTearDown(() async => conn.close());
 
diff --git a/test/json_test.dart b/test/json_test.dart
index 717b0b0b..615c2813 100644
--- a/test/json_test.dart
+++ b/test/json_test.dart
@@ -8,9 +8,7 @@ void main() {
     late PostgreSQLConnection connection;
 
     setUp(() async {
-      connection = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      connection = await server.newPostgreSQLConnection();
       await connection.open();
 
       await connection.execute('''
diff --git a/test/logical_replication_test.dart b/test/logical_replication_test.dart
index 9924c7bc..d196cce3 100644
--- a/test/logical_replication_test.dart
+++ b/test/logical_replication_test.dart
@@ -13,12 +13,7 @@ void main() {
   //    - One for listening to streaming replications (this connection will be locked).
   //    - The other one to modify the database (e.g. insert, delete, update, truncate)
   withPostgresServer('test logical replication with pgoutput for decoding',
-      (server) {
-    final host = 'localhost';
-    final username = 'dart';
-    final password = 'dart';
-    final database = 'dart_test';
-
+      initSqls: replicationSchemaInit, (server) {
     final logicalDecodingPlugin = 'pgoutput';
     final replicationMode = ReplicationMode.logical;
     // use this for listening to messages
@@ -35,22 +30,16 @@ void main() {
 
     setUpAll(() async {
       replicationConn = PostgreSQLConnection(
-        host,
+        'localhost',
         await server.port,
-        database,
+        'postgres',
         username: 'replication',
         password: 'replication',
         replicationMode: replicationMode,
       );
       await replicationConn.open();
 
-      changesConn = PostgreSQLConnection(
-        host,
-        await server.port,
-        database,
-        username: username,
-        password: password,
-      );
+      changesConn = await server.newPostgreSQLConnection();
       await changesConn.open();
 
       // create testing tables
diff --git a/test/map_return_test.dart b/test/map_return_test.dart
index 6fda0475..051a0d2c 100644
--- a/test/map_return_test.dart
+++ b/test/map_return_test.dart
@@ -9,9 +9,7 @@ void main() {
   withPostgresServer('map return', (server) {
     late PostgreSQLConnection connection;
     setUp(() async {
-      connection = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      connection = await server.newPostgreSQLConnection();
       await connection.open();
 
       await connection.execute('''
diff --git a/test/notification_test.dart b/test/notification_test.dart
index 97ae5ef7..49a9994d 100644
--- a/test/notification_test.dart
+++ b/test/notification_test.dart
@@ -9,9 +9,7 @@ void main() {
   withPostgresServer('Successful notifications', (server) {
     late PostgreSQLConnection connection;
     setUp(() async {
-      connection = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      connection = await server.newPostgreSQLConnection();
       await connection.open();
     });
 
diff --git a/test/pool_test.dart b/test/pool_test.dart
index d864f4c1..0b4d757a 100644
--- a/test/pool_test.dart
+++ b/test/pool_test.dart
@@ -15,15 +15,8 @@ void main() {
     late PgPool pool;
 
     setUp(() async {
-      final endpoint = PgEndpoint(
-        host: 'localhost',
-        database: 'dart_test',
-        username: 'dart',
-        password: 'dart',
-        port: await server.port,
-      );
       pool = PgPool(
-        [endpoint],
+        [await server.endpoint],
         sessionSettings: _sessionSettings,
       );
 
@@ -90,15 +83,8 @@ void main() {
 
   withPostgresServer('limit pool connections', (server) {
     test('can limit concurrent connections', () async {
-      final endpoint = PgEndpoint(
-        host: 'localhost',
-        database: 'dart_test',
-        username: 'dart',
-        password: 'dart',
-        port: await server.port,
-      );
       final pool = PgPool(
-        [endpoint],
+        [await server.endpoint],
         sessionSettings: _sessionSettings,
         poolSettings: const PgPoolSettings(maxConnectionCount: 2),
       );
diff --git a/test/query_reuse_test.dart b/test/query_reuse_test.dart
index d770012e..dd36f37b 100644
--- a/test/query_reuse_test.dart
+++ b/test/query_reuse_test.dart
@@ -15,9 +15,7 @@ void main() {
     late PostgreSQLConnection connection;
 
     setUp(() async {
-      connection = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      connection = await server.newPostgreSQLConnection();
       await connection.open();
       await connection.execute(
           'CREATE TEMPORARY TABLE t (i int, s serial, bi bigint, bs bigserial, bl boolean, si smallint, t text, f real, d double precision, dt date, ts timestamp, tsz timestamptz)');
@@ -286,9 +284,7 @@ void main() {
     late PostgreSQLConnection connection;
 
     setUp(() async {
-      connection = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      connection = await server.newPostgreSQLConnection();
       await connection.open();
       await connection.execute(
           'CREATE TEMPORARY TABLE t (i1 int not null, i2 int not null)');
@@ -446,9 +442,7 @@ void main() {
     late PostgreSQLConnection connection;
 
     setUp(() async {
-      connection = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      connection = await server.newPostgreSQLConnection();
       await connection.open();
       await connection.execute(
           'CREATE TEMPORARY TABLE t (i int, s serial, bi bigint, bs bigserial, bl boolean, si smallint, t text, f real, d double precision, dt date, ts timestamp, tsz timestamptz)');
diff --git a/test/query_test.dart b/test/query_test.dart
index 8ff4575b..3f8be6fb 100644
--- a/test/query_test.dart
+++ b/test/query_test.dart
@@ -8,9 +8,7 @@ void main() {
     late PostgreSQLConnection connection;
 
     setUp(() async {
-      connection = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      connection = await server.newPostgreSQLConnection();
       await connection.open();
       await connection.execute('CREATE TEMPORARY TABLE t '
           '(i int, s serial, bi bigint, '
@@ -415,9 +413,7 @@ void main() {
     late PostgreSQLConnection connection;
 
     setUp(() async {
-      connection = PostgreSQLConnection(
-          'localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      connection = await server.newPostgreSQLConnection();
       await connection.open();
       await connection.execute(
           'CREATE TEMPORARY TABLE t (i1 int not null, i2 int not null)');
diff --git a/test/timeout_test.dart b/test/timeout_test.dart
index 5fb746d8..dd7239ac 100644
--- a/test/timeout_test.dart
+++ b/test/timeout_test.dart
@@ -10,8 +10,7 @@ void main() {
     late PostgreSQLConnection conn;
 
     setUp(() async {
-      conn = PostgreSQLConnection('localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      conn = await server.newPostgreSQLConnection();
       await conn.open();
       await conn.execute('CREATE TEMPORARY TABLE t (id INT UNIQUE)');
     });
diff --git a/test/transaction_test.dart b/test/transaction_test.dart
index 30422213..82b37b4c 100644
--- a/test/transaction_test.dart
+++ b/test/transaction_test.dart
@@ -11,8 +11,7 @@ void main() {
     late PostgreSQLConnection conn;
 
     setUp(() async {
-      conn = PostgreSQLConnection('localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      conn = await server.newPostgreSQLConnection();
       await conn.open();
       await conn.execute('CREATE TEMPORARY TABLE t (id INT UNIQUE)');
     });
@@ -314,8 +313,7 @@ void main() {
     late PostgreSQLConnection conn;
 
     setUp(() async {
-      conn = PostgreSQLConnection('localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      conn = await server.newPostgreSQLConnection();
       await conn.open();
       await conn.execute('CREATE TEMPORARY TABLE t (id INT UNIQUE)');
     });
@@ -415,8 +413,7 @@ void main() {
     late PostgreSQLConnection conn;
 
     setUp(() async {
-      conn = PostgreSQLConnection('localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      conn = await server.newPostgreSQLConnection();
       await conn.open();
       await conn.execute('CREATE TEMPORARY TABLE t (id INT UNIQUE)');
     });
@@ -563,8 +560,7 @@ void main() {
     late PostgreSQLConnection conn;
 
     setUp(() async {
-      conn = PostgreSQLConnection('localhost', await server.port, 'dart_test',
-          username: 'dart', password: 'dart');
+      conn = await server.newPostgreSQLConnection();
       await conn.open();
       await conn.execute('CREATE TEMPORARY TABLE t (id INT UNIQUE)');
     });
diff --git a/test/v3_close_test.dart b/test/v3_close_test.dart
index 379f59b7..3646f0c2 100644
--- a/test/v3_close_test.dart
+++ b/test/v3_close_test.dart
@@ -10,16 +10,8 @@ void main() {
     late PgConnection conn2;
 
     setUp(() async {
-      final endpoint = PgEndpoint(
-        host: 'localhost',
-        database: 'dart_test',
-        username: 'dart',
-        password: 'dart',
-        port: await server.port,
-      );
-
       conn1 = await PgConnection.open(
-        endpoint,
+        await server.endpoint,
         sessionSettings: PgSessionSettings(
           onBadSslCertificate: (cert) => true,
           //transformer: _loggingTransformer('c1'),
@@ -27,7 +19,7 @@ void main() {
       );
 
       conn2 = await PgConnection.open(
-        endpoint,
+        await server.endpoint,
         sessionSettings: PgSessionSettings(
           onBadSslCertificate: (cert) => true,
         ),
@@ -43,8 +35,9 @@ void main() {
       test(
         'with concurrent query: $concurrentQuery',
         () async {
+          final endpoint = await server.endpoint;
           final res = await conn2.execute(
-              "SELECT pid FROM pg_stat_activity where usename = 'dart';");
+              "SELECT pid FROM pg_stat_activity where usename = '${endpoint.username}';");
           final conn1PID = res.first.first as int;
 
           // Simulate issue by terminating a connection during a query
@@ -61,9 +54,10 @@ void main() {
     }
 
     test('with simple query protocol', () async {
+      final endpoint = await server.endpoint;
       // Get the PID for conn1
-      final res = await conn2
-          .execute("SELECT pid FROM pg_stat_activity where usename = 'dart';");
+      final res = await conn2.execute(
+          "SELECT pid FROM pg_stat_activity where usename = '${endpoint.username}';");
       final conn1PID = res.first.first as int;
 
       // ignore: unawaited_futures
diff --git a/test/v3_logical_replication_test.dart b/test/v3_logical_replication_test.dart
index dd81fd2b..29dd5d13 100644
--- a/test/v3_logical_replication_test.dart
+++ b/test/v3_logical_replication_test.dart
@@ -38,7 +38,7 @@ void main() {
   //    - One for listening to streaming replications (this connection will be locked).
   //    - The other one to modify the database (e.g. insert, delete, update, truncate)
   withPostgresServer('test logical replication with pgoutput for decoding',
-      (server) {
+      initSqls: replicationSchemaInit, (server) {
     // use this for listening to messages
     late final PgConnection replicationConn;
 
@@ -64,7 +64,7 @@ void main() {
       replicationConn = await PgConnection.open(
         PgEndpoint(
           host: 'localhost',
-          database: 'dart_test',
+          database: 'postgres',
           username: 'replication',
           password: 'replication',
           port: await server.port,
@@ -80,13 +80,7 @@ void main() {
       // used to create changes in the db that are reflected in the replication
       // stream
       changesConn = await PgConnection.open(
-        PgEndpoint(
-          host: 'localhost',
-          database: 'dart_test',
-          username: 'dart',
-          password: 'dart',
-          port: await server.port,
-        ),
+        await server.endpoint,
         sessionSettings: PgSessionSettings(
           onBadSslCertificate: (cert) => true,
         ),
diff --git a/test/v3_test.dart b/test/v3_test.dart
index 8600345a..f92da892 100644
--- a/test/v3_test.dart
+++ b/test/v3_test.dart
@@ -50,7 +50,7 @@ void main() {
 
     setUp(() async {
       connection = await PgConnection.open(
-        await server.dartTestEndpoint(),
+        await server.endpoint,
         sessionSettings: _sessionSettings,
       );
     });
@@ -433,7 +433,7 @@ void main() {
       );
 
       final connection = await PgConnection.open(
-        await server.dartTestEndpoint(),
+        await server.endpoint,
         sessionSettings: PgSessionSettings(
           transformer: transformer,
           onBadSslCertificate: (_) => true,
@@ -453,7 +453,7 @@ void main() {
 
     setUp(() async {
       conn1 = await PgConnection.open(
-        await server.dartTestEndpoint(),
+        await server.endpoint,
         sessionSettings: PgSessionSettings(
           transformer: _loggingTransformer('c1'),
           onBadSslCertificate: (cert) => true,
@@ -461,7 +461,7 @@ void main() {
       );
 
       conn2 = await PgConnection.open(
-        await server.dartTestEndpoint(),
+        await server.endpoint,
         sessionSettings: PgSessionSettings(
           transformer: _loggingTransformer('c2'),
           onBadSslCertificate: (cert) => true,
@@ -478,8 +478,9 @@ void main() {
       test(
         'with concurrent query: $concurrentQuery',
         () async {
+          final endpoint = await server.endpoint;
           final res = await conn2.execute(
-              "SELECT pid FROM pg_stat_activity where usename = 'dart';");
+              "SELECT pid FROM pg_stat_activity where usename = '${endpoint.username}';");
           final conn1PID = res.first.first as int;
 
           // Simulate issue by terminating a connection during a query
@@ -497,9 +498,10 @@ void main() {
     }
 
     test('with simple query protocol', () async {
+      final endpoint = await server.endpoint;
       // Get the PID for conn1
-      final res = await conn2
-          .execute("SELECT pid FROM pg_stat_activity where usename = 'dart';");
+      final res = await conn2.execute(
+          "SELECT pid FROM pg_stat_activity where usename = '${endpoint.username}';");
       final conn1PID = res.first.first as int;
 
       expect(