diff --git a/tests/Testcontainers.Tests/Fixtures/Containers/Unix/DockerTlsFixture.cs b/tests/Testcontainers.Tests/Fixtures/Containers/Unix/DockerTlsFixtures.cs
similarity index 52%
rename from tests/Testcontainers.Tests/Fixtures/Containers/Unix/DockerTlsFixture.cs
rename to tests/Testcontainers.Tests/Fixtures/Containers/Unix/DockerTlsFixtures.cs
index 805409824..7dbac00b7 100644
--- a/tests/Testcontainers.Tests/Fixtures/Containers/Unix/DockerTlsFixture.cs
+++ b/tests/Testcontainers.Tests/Fixtures/Containers/Unix/DockerTlsFixtures.cs
@@ -9,35 +9,36 @@ namespace DotNet.Testcontainers.Tests.Fixtures
   using JetBrains.Annotations;
   using Xunit;
 
-  [UsedImplicitly]
-  public sealed class DockerTlsFixture : IAsyncLifetime
+  public abstract class DockerTlsFixtures : IAsyncLifetime
   {
+    public readonly string Version = "20.10.18";
+
     private const ushort TlsPort = 2376;
 
     private const string CertsDirectoryName = "certs";
 
-    private readonly ITestcontainersContainer container;
+    private readonly ITestcontainersBuilder<TestcontainersContainer> containerBuilder;
+
+    private ITestcontainersContainer container;
 
-    public DockerTlsFixture()
+    protected DockerTlsFixtures()
     {
-      this.container = new TestcontainersBuilder<TestcontainersContainer>()
-        .WithImage("docker:20.10.18-dind")
+      this.containerBuilder = new TestcontainersBuilder<TestcontainersContainer>()
+        .WithImage($"docker:{this.Version}-dind")
         .WithPrivileged(true)
         .WithEnvironment("DOCKER_CERT_PATH", this.ContainerCertDirectoryPath)
         .WithEnvironment("DOCKER_TLS_CERTDIR", this.ContainerCertDirectoryPath)
-        .WithEnvironment("DOCKER_TLS_VERIFY", "1")
         .WithBindMount(this.HostCertDirectoryPath, this.ContainerCertDirectoryPath, AccessMode.ReadWrite)
         .WithPortBinding(TlsPort, true)
         .WithWaitStrategy(Wait.ForUnixContainer()
-          .UntilPortIsAvailable(TlsPort))
-        .Build();
+          .UntilPortIsAvailable(TlsPort));
     }
 
     public string ContainerCertDirectoryPath { get; }
       = Path.Combine("/", CertsDirectoryName);
 
     public string HostCertDirectoryPath { get; }
-      = Path.Combine(Path.GetTempPath(), CertsDirectoryName);
+      = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString(), CertsDirectoryName);
 
     public Uri TcpEndpoint
     {
@@ -53,9 +54,32 @@ public Task InitializeAsync()
       return this.container.StartAsync();
     }
 
-    public Task DisposeAsync()
+    public async Task DisposeAsync()
+    {
+      await this.container.DisposeAsync();
+    }
+
+    [UsedImplicitly]
+    public class DockerTlsFixture : DockerTlsFixtures
+    {
+      public DockerTlsFixture()
+      {
+        this.container = this.containerBuilder
+          .WithEnvironment("DOCKER_TLS", "1")
+          .WithCommand("--tlsverify=false")
+          .Build();
+      }
+    }
+
+    [UsedImplicitly]
+    public class DockerMTlsFixture : DockerTlsFixtures
     {
-      return this.container.DisposeAsync().AsTask();
+      public DockerMTlsFixture()
+      {
+        this.container = this.containerBuilder
+          .WithEnvironment("DOCKER_TLS_VERIFY", "1")
+          .Build();
+      }
     }
   }
 }
diff --git a/tests/Testcontainers.Tests/Unit/Containers/Unix/DockerTlsTest.cs b/tests/Testcontainers.Tests/Unit/Containers/Unix/DockerTlsTest.cs
deleted file mode 100644
index 4ecf506e5..000000000
--- a/tests/Testcontainers.Tests/Unit/Containers/Unix/DockerTlsTest.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-namespace DotNet.Testcontainers.Tests.Unit.Containers.Unix
-{
-  using System;
-  using System.Collections.Generic;
-  using System.IO;
-  using System.Linq;
-  using System.Threading.Tasks;
-  using DotNet.Testcontainers.Builders;
-  using DotNet.Testcontainers.Clients;
-  using DotNet.Testcontainers.Configurations;
-  using DotNet.Testcontainers.Tests.Fixtures;
-  using Microsoft.Extensions.Logging.Abstractions;
-  using Xunit;
-
-  public sealed class DockerTlsTest : IClassFixture<DockerTlsFixture>
-  {
-    private readonly ICustomConfiguration customConfiguration;
-
-    public DockerTlsTest(DockerTlsFixture dockerTlsFixture)
-    {
-      IList<string> properties = new List<string>();
-      properties.Add($"docker.host={dockerTlsFixture.TcpEndpoint}");
-      properties.Add($"docker.cert.path={Path.Combine(dockerTlsFixture.HostCertDirectoryPath, "client")}");
-      properties.Add("docker.tls=true");
-      this.customConfiguration = new PropertiesFileConfiguration(properties.ToArray());
-    }
-
-    [Fact]
-    public async Task GetVersionReturnsVersion()
-    {
-      // Given
-      var authConfig = new MTlsEndpointAuthenticationProvider(this.customConfiguration).GetAuthConfig();
-
-      // When
-      IDockerSystemOperations systemOperations = new DockerSystemOperations(Guid.Empty, authConfig, NullLogger.Instance);
-
-      var version = await systemOperations.GetVersion()
-        .ConfigureAwait(false);
-
-      // Then
-      Assert.Equal("20.10.18", version.Version);
-    }
-  }
-}
diff --git a/tests/Testcontainers.Tests/Unit/Containers/Unix/DockerTlsTests.cs b/tests/Testcontainers.Tests/Unit/Containers/Unix/DockerTlsTests.cs
new file mode 100644
index 000000000..29d0316c2
--- /dev/null
+++ b/tests/Testcontainers.Tests/Unit/Containers/Unix/DockerTlsTests.cs
@@ -0,0 +1,80 @@
+namespace DotNet.Testcontainers.Tests.Unit.Containers.Unix
+{
+  using System;
+  using System.Collections.Generic;
+  using System.IO;
+  using System.Threading.Tasks;
+  using DotNet.Testcontainers.Builders;
+  using DotNet.Testcontainers.Clients;
+  using DotNet.Testcontainers.Configurations;
+  using DotNet.Testcontainers.Tests.Fixtures;
+  using Microsoft.Extensions.Logging.Abstractions;
+  using Xunit;
+
+  public static class DockerTlsTests
+  {
+    private static ICustomConfiguration CreateConfiguration(DockerTlsFixtures fixture, bool tls = false, bool tlsVerify = false)
+    {
+      var properties = new List<string>();
+      properties.Add($"docker.host={fixture.TcpEndpoint}");
+      properties.Add($"docker.cert.path={Path.Combine(fixture.HostCertDirectoryPath, "client")}");
+      properties.Add($"docker.tls={tls}");
+      properties.Add($"docker.tls.verify={tlsVerify}");
+      return new PropertiesFileConfiguration(properties.ToArray());
+    }
+
+    public sealed class DockerTlsTest : IClassFixture<DockerTlsFixtures.DockerTlsFixture>
+    {
+      private readonly ICustomConfiguration customConfiguration;
+      private readonly string expectedVersion;
+
+      public DockerTlsTest(DockerTlsFixtures.DockerTlsFixture dockerTlsFixture)
+      {
+        this.customConfiguration = CreateConfiguration(dockerTlsFixture, true);
+        this.expectedVersion = dockerTlsFixture.Version;
+      }
+
+      [Fact]
+      public async Task GetVersionReturnsVersion()
+      {
+        // Given
+        var authConfig = new TlsEndpointAuthenticationProvider(this.customConfiguration).GetAuthConfig();
+
+        // When
+        var systemOperations = new DockerSystemOperations(Guid.Empty, authConfig, NullLogger.Instance);
+        var version = await systemOperations.GetVersion()
+          .ConfigureAwait(false);
+
+        // Then
+        Assert.Equal(this.expectedVersion, version.Version);
+      }
+    }
+
+    public sealed class DockerMTlsTest : IClassFixture<DockerTlsFixtures.DockerMTlsFixture>
+    {
+      private readonly ICustomConfiguration customConfiguration;
+      private readonly string expectedVersion;
+
+      public DockerMTlsTest(DockerTlsFixtures.DockerMTlsFixture dockerMTlsFixture)
+      {
+        this.customConfiguration = CreateConfiguration(dockerMTlsFixture, tlsVerify: true);
+        this.expectedVersion = dockerMTlsFixture.Version;
+      }
+
+      [Fact]
+      public async Task GetVersionReturnsVersion()
+      {
+        // Given
+        var authConfig = new MTlsEndpointAuthenticationProvider(this.customConfiguration).GetAuthConfig();
+
+        // When
+        var systemOperations = new DockerSystemOperations(Guid.Empty, authConfig, NullLogger.Instance);
+        var version = await systemOperations.GetVersion()
+          .ConfigureAwait(false);
+
+        // Then
+        Assert.Equal(this.expectedVersion, version.Version);
+      }
+    }
+  }
+}