diff --git a/tests/integration/paymaster.test.ts b/tests/integration/paymaster.test.ts
index 382263b8..5e88595a 100644
--- a/tests/integration/paymaster.test.ts
+++ b/tests/integration/paymaster.test.ts
@@ -27,12 +27,11 @@ describe("Paymaster", () => {
             const tokenAddress = await tokenContract.getAddress();
 
             // mint tokens to wallet, so it could pay fee with tokens
-            await tokenContract.mint(
+            const mintTx = await tokenContract.mint(
                 Typed.address(await wallet.getAddress()),
                 Typed.uint256(INIT_MINT_AMOUNT),
-            );
-
-            await utils.sleep(1000); // workaround for duplicated nonce
+            ) as ethers.ContractTransactionResponse;
+            await mintTx.wait();
 
             const paymasterAbi = require(paymasterPath).abi;
             const paymasterBytecode = require(paymasterPath).bytecode;
diff --git a/tests/setup/setup.sh b/tests/setup/setup.sh
index 2c2ae5be..28f04819 100755
--- a/tests/setup/setup.sh
+++ b/tests/setup/setup.sh
@@ -4,6 +4,7 @@ docker create -it --name golang --network host --entrypoint /usr/local/bin/entry
 docker cp entrypoint.sh golang:/usr/local/bin/entrypoint.sh
 docker start -i golang # this will wait for container to execute only if the script is run in interactive mode
 docker wait golang
-docker cp golang:/root/setup/token.json ../token.json || docker logs golang && exit 1
+docker logs golang
+docker cp golang:/root/setup/token.json ../token.json || exit 1
 docker rm golang
 cat ../token.json
\ No newline at end of file