diff --git a/test/__setup__/build-utils.ts b/test/__setup__/build-utils.ts
index 8eaf62d21..eea798373 100644
--- a/test/__setup__/build-utils.ts
+++ b/test/__setup__/build-utils.ts
@@ -1,18 +1,10 @@
 import type { ApifyClient } from 'apify-client';
 
-import { ACTOR_JOB_STATUSES } from '@apify/consts';
-
 /**
  * Waits for the build to finish
  */
-export const waitForBuildToFinish = async (client: ApifyClient, buildId: string) => {
-	while (true) {
-		const build = await client.build(buildId).get();
-		if (build!.status !== (ACTOR_JOB_STATUSES.RUNNING as unknown)) return build;
-		await new Promise((resolve) => {
-			setTimeout(resolve, 2500);
-		});
-	}
+export const waitForBuildToFinish = (client: ApifyClient, buildId: string) => {
+	return client.build(buildId).waitForFinish();
 };
 
 /**
diff --git a/test/api/commands/builds/tags.test.ts b/test/api/commands/builds/tags.test.ts
index 709bc6c67..2c7999d74 100644
--- a/test/api/commands/builds/tags.test.ts
+++ b/test/api/commands/builds/tags.test.ts
@@ -51,7 +51,7 @@ describe('[api] apify builds add-tag / remove-tag', () => {
 
 		// Build the actor and wait for it to finish
 		const buildStarted = await testUserClient.actor(testActor.id).build('0.0');
-		testBuild = (await waitForBuildToFinish(testUserClient, buildStarted.id))!;
+		testBuild = await waitForBuildToFinish(testUserClient, buildStarted.id);
 	}, TEST_TIMEOUT);
 
 	afterAll(async () => {
@@ -110,7 +110,7 @@ describe('[api] apify builds add-tag / remove-tag', () => {
 
 				// Create another build
 				const buildStarted2 = await testUserClient.actor(testActor.id).build('0.0');
-				const testBuild2 = (await waitForBuildToFinish(testUserClient, buildStarted2.id))!;
+				const testBuild2 = await waitForBuildToFinish(testUserClient, buildStarted2.id);
 
 				// Reassign the tag to the new build
 				await testRunCommand(BuildsAddTagCommand, {
@@ -169,7 +169,7 @@ describe('[api] apify builds add-tag / remove-tag', () => {
 			async () => {
 				// Create another build and tag it
 				const buildStarted2 = await testUserClient.actor(testActor.id).build('0.0');
-				const testBuild2 = (await waitForBuildToFinish(testUserClient, buildStarted2.id))!;
+				const testBuild2 = await waitForBuildToFinish(testUserClient, buildStarted2.id);
 
 				await testRunCommand(BuildsAddTagCommand, {
 					flags_build: testBuild2.id,