diff --git a/test/conversion.test.js b/test/conversion.test.js
index f0015b38dd..7fd261eae4 100644
--- a/test/conversion.test.js
+++ b/test/conversion.test.js
@@ -33,6 +33,7 @@ const queryPackage = require('../src-electron/db/query-package.js')
 const queryZcl = require('../src-electron/db/query-zcl.js')
 const util = require('../src-electron/util/util.js')
 
+let timeout = testUtil.longTimeout
 let haLightIsc = path.join(__dirname, 'resource/isc/ha-light.isc')
 let haCombinedIsc = path.join(
   __dirname,
@@ -129,7 +130,7 @@ test.skip(
     )
     expect(clientAttributesCount).toBe(2)
   },
-  8000
+  timeout
 )
 
 test(
@@ -153,5 +154,5 @@ test(
     expect(dump.endpointTypes.length).toBe(1)
     expect(dump.endpoints.length).toBe(1)
   },
-  8000
+  timeout
 )
diff --git a/test/genengine.test.js b/test/genengine.test.js
index 1dddcc3b84..5582ed4233 100644
--- a/test/genengine.test.js
+++ b/test/genengine.test.js
@@ -32,7 +32,7 @@ const testUtil = require('./test-util.js')
 
 let db
 const templateCount = testUtil.testTemplateCount
-const genTimeout = 8000
+const genTimeout = testUtil.longTimeout
 const testFile = path.join(__dirname, 'resource/generation-test-file-1.zap')
 const testFile2 = path.join(__dirname, 'resource/three-endpoint-device.zap')
 
diff --git a/test/generation.test.js b/test/generation.test.js
index b8cedf37d1..e7b89e5ec2 100644
--- a/test/generation.test.js
+++ b/test/generation.test.js
@@ -32,7 +32,7 @@ const util = require('../src-electron/util/util.js')
 
 let db
 const { port, baseUrl } = testUtil.testServer(__filename)
-const timeout = 8000
+const timeout = testUtil.longTimeout
 let uuid = util.createUuid()
 
 beforeAll(() => {
diff --git a/test/test-util.js b/test/test-util.js
index 32623ed97a..9202e295b9 100644
--- a/test/test-util.js
+++ b/test/test-util.js
@@ -62,3 +62,5 @@ exports.totalSpecCount = 39
 exports.totalEnumCount = 209
 exports.totalEnumItemCount = 1595
 exports.testTemplateCount = 17
+
+exports.longTimeout = 12000