diff --git a/bindings/c/test/apitester/TesterTransactionExecutor.cpp b/bindings/c/test/apitester/TesterTransactionExecutor.cpp
index 36f8e43ec9..16e2659a58 100644
--- a/bindings/c/test/apitester/TesterTransactionExecutor.cpp
+++ b/bindings/c/test/apitester/TesterTransactionExecutor.cpp
@@ -228,7 +228,7 @@ public:
 			FDBDatabase* db;
 			fdb_error_t err = fdb_create_database(clusterFile, &db);
 			if (err != error_code_success) {
-				throw TesterError(fmt::format("Failed create database with the culster file '{}'. Error: {}({})",
+				throw TesterError(fmt::format("Failed create database with the cluster file '{}'. Error: {}({})",
 				                              clusterFile,
 				                              err,
 				                              fdb_get_error(err)));
diff --git a/bindings/c/test/apitester/TesterWorkload.cpp b/bindings/c/test/apitester/TesterWorkload.cpp
index 270bfb7c8c..a374e5a09c 100644
--- a/bindings/c/test/apitester/TesterWorkload.cpp
+++ b/bindings/c/test/apitester/TesterWorkload.cpp
@@ -20,9 +20,11 @@
 
 #include "TesterWorkload.h"
 #include "TesterUtil.h"
+#include "test/apitester/TesterScheduler.h"
 #include <cstdlib>
 #include <memory>
 #include <fmt/format.h>
+#include <vector>
 
 namespace FdbApiTester {
 
@@ -74,8 +76,7 @@ void WorkloadBase::schedule(TTaskFct task) {
 	tasksScheduled++;
 	manager->scheduler->schedule([this, task]() {
 		task();
-		tasksScheduled--;
-		checkIfDone();
+		scheduledTaskDone();
 	});
 }
 
@@ -98,8 +99,7 @@ void WorkloadBase::execTransaction(std::shared_ptr<ITransactionActor> tx, TTaskF
 				cont();
 			}
 		}
-		tasksScheduled--;
-		checkIfDone();
+		scheduledTaskDone();
 	});
 }
 
@@ -116,8 +116,8 @@ void WorkloadBase::error(const std::string& msg) {
 	}
 }
 
-void WorkloadBase::checkIfDone() {
-	if (tasksScheduled == 0) {
+void WorkloadBase::scheduledTaskDone() {
+	if (--tasksScheduled == 0) {
 		if (numErrors > 0) {
 			error(fmt::format("Workload failed with {} errors", numErrors.load()));
 		} else {
@@ -133,14 +133,18 @@ void WorkloadManager::add(std::shared_ptr<IWorkload> workload, TTaskFct cont) {
 }
 
 void WorkloadManager::run() {
+	std::vector<std::shared_ptr<IWorkload>> initialWorkloads;
 	for (auto iter : workloads) {
-		iter.first->init(this);
+		initialWorkloads.push_back(iter.second.ref);
 	}
-	for (auto iter : workloads) {
-		iter.first->start();
+	for (auto iter : initialWorkloads) {
+		iter->init(this);
+	}
+	for (auto iter : initialWorkloads) {
+		iter->start();
 	}
 	scheduler->join();
-	if (numWorkloadsFailed > 0) {
+	if (failed()) {
 		fmt::print(stderr, "{} workloads failed", numWorkloadsFailed);
 	} else {
 		fprintf(stderr, "All workloads succesfully completed");
diff --git a/bindings/c/test/apitester/TesterWorkload.h b/bindings/c/test/apitester/TesterWorkload.h
index 023a443757..d1e9f94c3d 100644
--- a/bindings/c/test/apitester/TesterWorkload.h
+++ b/bindings/c/test/apitester/TesterWorkload.h
@@ -95,8 +95,9 @@ protected:
 private:
 	WorkloadManager* manager;
 
-	// Check if workload is done and notify the workload manager
-	void checkIfDone();
+	// Decrease scheduled task counter, notify the workload manager
+	// that the task is done if no more tasks schedule
+	void scheduledTaskDone();
 
 	// Keep track of tasks scheduled by the workload
 	// End workload when this number falls to 0