diff --git a/Boundaries/Comanda.Orders/Tests/Fixtures/WebApplicationFixture.cs b/Boundaries/Comanda.Orders/Tests/Fixtures/WebApplicationFixture.cs
index bb63eec..1a3a2f7 100644
--- a/Boundaries/Comanda.Orders/Tests/Fixtures/WebApplicationFixture.cs
+++ b/Boundaries/Comanda.Orders/Tests/Fixtures/WebApplicationFixture.cs
@@ -17,6 +17,7 @@ public WebApplicationFixture()
     public async ValueTask InitializeAsync()
     {
         await _databaseFixture.InitializeAsync();
+        await _databaseFixture.CleanDatabaseAsync();
 
         Environment.SetEnvironmentVariable("Settings__Database__ConnectionString", _databaseFixture.ConnectionString);
         Environment.SetEnvironmentVariable("Settings__Database__DatabaseName", _databaseFixture.DatabaseName);
@@ -63,7 +64,6 @@ public async ValueTask DisposeAsync()
         HttpClient.Dispose();
 
         await _factory.DisposeAsync();
-        await _databaseFixture.CleanDatabaseAsync();
         await _databaseFixture.DisposeAsync();
     }
 }
diff --git a/Boundaries/Comanda.Payments/Tests/Fixtures/WebApplicationFixture.cs b/Boundaries/Comanda.Payments/Tests/Fixtures/WebApplicationFixture.cs
index ccba7f1..b3b4bfc 100644
--- a/Boundaries/Comanda.Payments/Tests/Fixtures/WebApplicationFixture.cs
+++ b/Boundaries/Comanda.Payments/Tests/Fixtures/WebApplicationFixture.cs
@@ -20,6 +20,7 @@ public WebApplicationFixture()
     public async ValueTask InitializeAsync()
     {
         await _databaseFixture.InitializeAsync();
+        await _databaseFixture.CleanDatabaseAsync();
 
         Environment.SetEnvironmentVariable("Settings__Database__ConnectionString", _databaseFixture.ConnectionString);
         Environment.SetEnvironmentVariable("Settings__Database__DatabaseName", _databaseFixture.DatabaseName);
@@ -66,7 +67,6 @@ public async ValueTask DisposeAsync()
         HttpClient.Dispose();
 
         await _factory.DisposeAsync();
-        await _databaseFixture.CleanDatabaseAsync();
         await _databaseFixture.DisposeAsync();
     }
 }
diff --git a/Boundaries/Comanda.Profiles/Tests/Fixtures/WebApplicationFixture.cs b/Boundaries/Comanda.Profiles/Tests/Fixtures/WebApplicationFixture.cs
index 24cde00..c2b3894 100644
--- a/Boundaries/Comanda.Profiles/Tests/Fixtures/WebApplicationFixture.cs
+++ b/Boundaries/Comanda.Profiles/Tests/Fixtures/WebApplicationFixture.cs
@@ -20,6 +20,7 @@ public WebApplicationFixture()
     public async ValueTask InitializeAsync()
     {
         await _databaseFixture.InitializeAsync();
+        await _databaseFixture.CleanDatabaseAsync();
 
         Environment.SetEnvironmentVariable("Settings__Database__ConnectionString", _databaseFixture.ConnectionString);
         Environment.SetEnvironmentVariable("Settings__Database__DatabaseName", _databaseFixture.DatabaseName);
@@ -66,7 +67,6 @@ public async ValueTask DisposeAsync()
         HttpClient.Dispose();
 
         await _factory.DisposeAsync();
-        await _databaseFixture.CleanDatabaseAsync();
         await _databaseFixture.DisposeAsync();
     }
 }
diff --git a/Boundaries/Comanda.Stores/Tests/Fixtures/WebApplicationFixture.cs b/Boundaries/Comanda.Stores/Tests/Fixtures/WebApplicationFixture.cs
index 3d3a9bf..ecff682 100644
--- a/Boundaries/Comanda.Stores/Tests/Fixtures/WebApplicationFixture.cs
+++ b/Boundaries/Comanda.Stores/Tests/Fixtures/WebApplicationFixture.cs
@@ -17,6 +17,7 @@ public WebApplicationFixture()
     public async ValueTask InitializeAsync()
     {
         await _databaseFixture.InitializeAsync();
+        await _databaseFixture.CleanDatabaseAsync();
 
         Environment.SetEnvironmentVariable("Settings__Database__ConnectionString", _databaseFixture.ConnectionString);
         Environment.SetEnvironmentVariable("Settings__Database__DatabaseName", _databaseFixture.DatabaseName);
@@ -50,7 +51,6 @@ public async ValueTask DisposeAsync()
         HttpClient.Dispose();
 
         await _factory.DisposeAsync();
-        await _databaseFixture.CleanDatabaseAsync();
         await _databaseFixture.DisposeAsync();
     }
 }
diff --git a/Boundaries/Comanda.Subscriptions/Tests/Fixtures/WebApplicationFixture.cs b/Boundaries/Comanda.Subscriptions/Tests/Fixtures/WebApplicationFixture.cs
index 565f03e..647db22 100644
--- a/Boundaries/Comanda.Subscriptions/Tests/Fixtures/WebApplicationFixture.cs
+++ b/Boundaries/Comanda.Subscriptions/Tests/Fixtures/WebApplicationFixture.cs
@@ -21,6 +21,7 @@ public WebApplicationFixture()
     public async ValueTask InitializeAsync()
     {
         await _databaseFixture.InitializeAsync();
+        await _databaseFixture.CleanDatabaseAsync();
 
         Environment.SetEnvironmentVariable("Settings__Database__ConnectionString", _databaseFixture.ConnectionString);
         Environment.SetEnvironmentVariable("Settings__Database__DatabaseName", _databaseFixture.DatabaseName);
@@ -73,7 +74,6 @@ public async ValueTask DisposeAsync()
         HttpClient.Dispose();
 
         await _factory.DisposeAsync();
-        await _databaseFixture.CleanDatabaseAsync();
         await _databaseFixture.DisposeAsync();
     }
 }