diff --git a/JSMR.Tests/Fixtures/MariaDbFixture.cs b/JSMR.Tests/Fixtures/MariaDbFixture.cs
index 48b9321..f518afd 100644
--- a/JSMR.Tests/Fixtures/MariaDbFixture.cs
+++ b/JSMR.Tests/Fixtures/MariaDbFixture.cs
@@ -19,7 +19,7 @@ public sealed class MariaDbContainerFixture : IAsyncLifetime
     const int MinorVersion = 11;
     const int Build = 6;
 
-    private IContainer _container = default!;
+    private MariaDbContainer _container = default!;
     public string RootConnectionString { get; private set; } = default!;
 
     public async ValueTask InitializeAsync()
@@ -31,22 +31,31 @@ public sealed class MariaDbContainerFixture : IAsyncLifetime
         //    .WithWaitStrategy(Wait.ForUnixContainer().UntilPortIsAvailable(3306))
         //    .Build();
 
-        _container = new ContainerBuilder()
-           .WithImage($"mariadb:{MajorVersion}.{MinorVersion}.{Build}")
-           .WithEnvironment("MARIADB_ROOT_PASSWORD", "rootpw")
-           //.WithPortBinding(3307, 3306)
-           .WithPortBinding(3306, assignRandomHostPort: true)
-           .WithWaitStrategy(Wait.ForUnixContainer().UntilInternalTcpPortIsAvailable(3306))
-           .Build();
+        //_container = new ContainerBuilder()
+        //   .WithImage($"mariadb:{MajorVersion}.{MinorVersion}.{Build}")
+        //   .WithEnvironment("MARIADB_ROOT_PASSWORD", "rootpw")
+        //   //.WithPortBinding(3307, 3306)
+        //   .WithPortBinding(3306, assignRandomHostPort: true)
+        //   .WithWaitStrategy(Wait.ForUnixContainer().UntilInternalTcpPortIsAvailable(3306))
+        //   .Build();
+
+        _container = new MariaDbBuilder()
+            .WithImage($"mariadb:{MajorVersion}.{MinorVersion}.{Build}")
+            .WithEnvironment("MARIADB_ROOT_PASSWORD", "rootpw")
+            .WithUsername("root")
+            .WithPassword("rootpw")
+            // no explicit port binding
+            .WithWaitStrategy(Wait.ForUnixContainer().UntilInternalTcpPortIsAvailable(3306))
+            .Build();
 
         await _container.StartAsync();
 
         // No database specified: we’ll create per-test DBs
         //RootConnectionString = "Server=127.0.0.1;Port=3307;User=root;Password=rootpw;SslMode=none;";
 
-        //RootConnectionString = _container.GetConnectionString();
+        RootConnectionString = _container.GetConnectionString();
         var port = _container.GetMappedPublicPort(3306);
-        RootConnectionString = $"Server=127.0.0.1;Port={port};User=root;Password=rootpw;SslMode=none;";
+        //RootConnectionString = $"Server=127.0.0.1;Port={port};User=root;Password=rootpw;SslMode=none;";
     }
 
     public async ValueTask DisposeAsync() => await _container.DisposeAsync();