diff --git a/src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchConfigurationTests.cs b/src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchConfigurationTests.cs
index ae09915ce2..529b685442 100644
--- a/src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchConfigurationTests.cs
+++ b/src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchConfigurationTests.cs
@@ -276,7 +276,7 @@ public async Task SysbenchConfigurationProperlyExecutesTPCCPreparation()
 
             string[] expectedCommands =
             {
-                $"python3 {this.mockPackagePath}/populate-database.py --dbName sbtest --databaseSystem MySQL --benchmark TPCC --threadCount 8 --tableCount 10 --warehouses 0 --password [A-Za-z0-9+/=]+ --hostIpAddress \"1.2.3.5\""
+                $"python3 {this.mockPackagePath}/populate-database.py --dbName sbtest --databaseSystem MySQL --benchmark TPCC --threadCount 8 --tableCount 10 --warehouses 1 --password [A-Za-z0-9+/=]+ --hostIpAddress \"1.2.3.5\""
             };
 
             int commandNumber = 0;
diff --git a/src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchExecutor.cs b/src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchExecutor.cs
index 5703d485e5..c601232334 100644
--- a/src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchExecutor.cs
+++ b/src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchExecutor.cs
@@ -427,7 +427,7 @@ protected string BuildSysbenchLoggingArguments(SysbenchMode mode)
                     int warehouseCount = mode switch
                     {
                         SysbenchMode.Prepare => 1,
-                        SysbenchMode.Populate => warehouseEstimate - 1,
+                        SysbenchMode.Populate => Math.Max(1, warehouseEstimate - 1),
                         SysbenchMode.Run => warehouseEstimate,
                         _ => warehouseEstimate
                     };