diff --git a/web3.js/test/connection.test.js b/web3.js/test/connection.test.js
index ab71502820..60b564f85d 100644
--- a/web3.js/test/connection.test.js
+++ b/web3.js/test/connection.test.js
@@ -497,8 +497,6 @@ test('account change notification', async () => {
   const loader = new Loader(connection, BpfLoader.programId);
   await loader.load(programAccount, [1, 2, 3]);
 
-  await connection.removeAccountChangeListener(subscriptionId);
-
   // mockCallback should be called twice
   //
   // retry a couple times if needed
@@ -515,6 +513,8 @@ test('account change notification', async () => {
     await sleep(500);
   }
 
+  await connection.removeAccountChangeListener(subscriptionId);
+
   // First mockCallback call is due to SystemProgram.createAccount()
   expect(mockCallback.mock.calls[0][0].tokens).toBe(42);
   expect(mockCallback.mock.calls[0][0].executable).toBe(false);
diff --git a/web3.js/test/token-program.test.js b/web3.js/test/token-program.test.js
index 8bcd3db1f2..2713babe02 100644
--- a/web3.js/test/token-program.test.js
+++ b/web3.js/test/token-program.test.js
@@ -6,6 +6,7 @@ import {mockRpc, mockRpcEnabled} from './__mocks__/node-fetch';
 import {url} from './url';
 import {newAccountWithTokens} from './new-account-with-tokens';
 import {mockGetLastId} from './mockrpc/getlastid';
+import {sleep} from '../src/util/sleep';
 
 if (!mockRpcEnabled) {
   // The default of 5 seconds is too slow for live testing sometimes
@@ -546,6 +547,8 @@ test('transfer', async () => {
     ]);
   }
 
+  await sleep(500);
+
   const destAccountInfo = await testToken.accountInfo(dest);
   expect(destAccountInfo.amount.toNumber()).toBe(123);
 });