diff --git a/.mocharc.js b/.mocharc.js
index 06a56b266e..0cee50ca89 100644
--- a/.mocharc.js
+++ b/.mocharc.js
@@ -2,7 +2,7 @@ module.exports = {
   require: 'tooling/babel-register.js',
   recursive: true,
   extension: '.js,.ts',
-  timeout: process.env.NETWORK ? '500s' : '40s',
+  timeout: process.env.NETWORK ? '500s' : '8s',
   ignore: 'test/environment/**',
   exit: true // TODO: fix in state channel tests
 }
diff --git a/test/integration/Middleware.ts b/test/integration/Middleware.ts
index 1ded1cff17..ab761eb061 100644
--- a/test/integration/Middleware.ts
+++ b/test/integration/Middleware.ts
@@ -42,6 +42,7 @@ describe('Middleware API', () => {
         payload: {
           block_hash: 'mh_LAo6Cg6d8LGDpxJ3se2aGJZbCubDZyC6GonHK58MKiW4a4LWb',
           block_height: 779178,
+          encoded_tx: 'tx_+QEKCwHAuQEE+QEBUQKhAR1BkBtnVYcqjIhl7aOh9hEy9W96OFTeeQreTa3ExE/auG8rEWzyVws7Ap8AoLb4BE1sdD+LZw3SM+libDajr+a976yRMKi9b7k5whrinwEBAFGw3Ke65y52/KhwL5lYHOlRuOIZZy2V190M5H1ywIgN5fAylDfLImUL3WDwC4UAHa6EcyMc3Pl8apaHFuO79AMDhkduhMz4AILDUIQ7msoAuFr4WAsBwLhT+FEMAaEBHUGQG2dVhyqMiGXto6H2ETL1b3o4VN55Ct5NrcTET9qhAUCcLjbyYA3yE1vkfr0zC0M4oNrQ3lNoPHDD6EzUnVzAcIYPJvVhyAAAAIAv4MYN',
           hash: 'th_YHj5aB6JzHciY5f6jqgtso8u2iY9p6MT9RV96FwXQNS1MpSML',
           micro_index: 18,
           micro_time: 1684995426848,
@@ -79,6 +80,7 @@ describe('Middleware API', () => {
         payload: {
           block_hash: 'mh_2R1PVwTNP3Jha7oRby9Me3SRBP4R9he6RMH6eCCJGyVBHAzy5f',
           block_height: 779178,
+          encoded_tx: 'tx_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',
           hash: 'th_AScnu6AAGHvfewMELKvmc6KH9jaMfzopGpcFFo1HAoS7ne1fD',
           micro_index: 11,
           micro_time: 1684995366595,
@@ -118,6 +120,7 @@ describe('Middleware API', () => {
         payload: {
           block_hash: 'mh_25snWYwTkU1xjPCcH592XVNzL894qSpF4yqnt8tABKGEVm6nSz',
           block_height: 779178,
+          encoded_tx: 'tx_+K4LAfhCuEBjZgd36W2H8rB5KZzut7wvRnAsjJSD+CEg8Dbm8ivFXmDzKFauG8QJpnm9kmVnNl0xOI7xVsm0brXYTMNuAmUDuGb4ZAwBoQHhMrjx3begTmO3+pZHmlS7xSWlMafxvAzkkhIZAwZ/sKEBHUGQG2dVhyqMiGXto6H2ETL1b3o4VN55Ct5NrcTET9qIRWORgkT0AACGD39vJaAAAIKQmIlGYXVjZXQgVHiaKLKm',
           hash: 'th_242zV1qXwag6iBH3Pd8zn3DQC37h4uP38CoFjkaTgT19AVKMHo',
           micro_index: 7,
           micro_time: 1684995336526,
diff --git a/test/integration/MiddlewareSubscriber.ts b/test/integration/MiddlewareSubscriber.ts
index f60f27dcb9..ae73067091 100644
--- a/test/integration/MiddlewareSubscriber.ts
+++ b/test/integration/MiddlewareSubscriber.ts
@@ -125,7 +125,7 @@ describe('MiddlewareSubscriber', () => {
       }),
     ]);
     expect(transaction).to.be.eql(await fetchNodeRaw(`transactions/${hash}`));
-  }).timeout(80_000);
+  });
 
   // TODO: enable after fixing https://github.com/aeternity/ae_mdw/issues/1337
   it.skip('subscribes for account', async () => {
@@ -138,7 +138,7 @@ describe('MiddlewareSubscriber', () => {
       });
     });
     expect(transaction).to.be.eql(await fetchNodeRaw(`transactions/${hash}`));
-  }).timeout(80_000);
+  });
 
   // TODO: enable after solving https://github.com/aeternity/ae_mdw/issues/1336
   it.skip('subscribes for micro block', async () => {
@@ -153,7 +153,7 @@ describe('MiddlewareSubscriber', () => {
       }),
     ]);
     expect(microBlock).to.be.eql(await fetchNodeRaw(`micro-blocks/hash/${blockHash}/header`));
-  }).timeout(80_000);
+  });
 
   // TODO: enable after solving https://github.com/aeternity/ae_mdw/issues/1336
   it.skip('subscribes simultaneously for micro block', async () => {
@@ -177,5 +177,5 @@ describe('MiddlewareSubscriber', () => {
     ]);
     expect(transaction).to.be.eql(await fetchNodeRaw(`transactions/${hash}`));
     expect(microBlock).to.be.eql(await fetchNodeRaw(`micro-blocks/hash/${blockHash}/header`));
-  }).timeout(80_000);
+  });
 });
diff --git a/test/integration/compiler.ts b/test/integration/compiler.ts
index 9f3049627f..00b20972ec 100644
--- a/test/integration/compiler.ts
+++ b/test/integration/compiler.ts
@@ -166,9 +166,9 @@ describe('CompilerHttp', () => {
   });
 
   it('throws exception if used invalid compiler url', async () => {
-    const c = new CompilerHttpNode('https://compiler.aepps.comas');
+    const c = new CompilerHttpNode('https://compilaer.aepps.com');
     await expect(c.compileBySourceCode('test'))
-      .to.be.rejectedWith('getaddrinfo ENOTFOUND compiler.aepps.comas');
+      .to.be.rejectedWith('getaddrinfo ENOTFOUND compilaer.aepps.com');
   });
 
   describe('getFileSystem', () => {
diff --git a/test/integration/rpc.ts b/test/integration/rpc.ts
index e950f0d158..8b30d3d6be 100644
--- a/test/integration/rpc.ts
+++ b/test/integration/rpc.ts
@@ -72,8 +72,7 @@ const getConnections = (): { walletWindow: ImplPostMessage; aeppWindow: ImplPost
   return { walletWindow, aeppWindow };
 };
 
-describe('Aepp<->Wallet', function aeppWallet() {
-  this.timeout(8000);
+describe('Aepp<->Wallet', () => {
   const connections = getConnections();
   const connectionFromWalletToAepp = new BrowserWindowMessageConnection({
     self: connections.walletWindow,