diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2288bcd3f..678b0674b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -77,7 +77,7 @@ jobs:
 
       - name: Run Test
         # external-plugins tests only run on schedule
-        # if: github.event_name == 'schedule' || matrix.test_suite != 'external-plugins'
+        if: github.event_name == 'schedule' || matrix.test_suite != 'external-plugins'
         env:
           AKISMET_KEY: ${{ secrets.AKISMET_KEY }}
         run: npm run ci -- ${{ matrix.test_suite }}
diff --git a/server/tests/api/live/live-constraints.ts b/server/tests/api/live/live-constraints.ts
index fabb8798d..59e27cc62 100644
--- a/server/tests/api/live/live-constraints.ts
+++ b/server/tests/api/live/live-constraints.ts
@@ -190,7 +190,7 @@ describe('Test live constraints', function () {
   })
 
   it('Should have max duration limit', async function () {
-    this.timeout(60000)
+    this.timeout(240000)
 
     await servers[0].config.updateCustomSubConfig({
       newConfig: {
diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts
index f9b0d257b..592548b52 100644
--- a/server/tests/api/live/live.ts
+++ b/server/tests/api/live/live.ts
@@ -447,7 +447,7 @@ describe('Test live', function () {
     })
 
     it('Should enable transcoding with some resolutions', async function () {
-      this.timeout(120000)
+      this.timeout(240000)
 
       const resolutions = [ 240, 480 ]
       await updateConf(resolutions)
@@ -499,7 +499,7 @@ describe('Test live', function () {
     })
 
     it('Should enable transcoding with some resolutions and correctly save them', async function () {
-      this.timeout(400_000)
+      this.timeout(500_000)
 
       const resolutions = [ 240, 360, 720 ]
 
@@ -586,7 +586,7 @@ describe('Test live', function () {
     })
 
     it('Should not generate an upper resolution than original file', async function () {
-      this.timeout(400_000)
+      this.timeout(500_000)
 
       const resolutions = [ 240, 480 ]
       await updateConf(resolutions)
diff --git a/server/tests/peertube-runner/client-cli.ts b/server/tests/peertube-runner/client-cli.ts
index 90bf73ef7..ff70e599f 100644
--- a/server/tests/peertube-runner/client-cli.ts
+++ b/server/tests/peertube-runner/client-cli.ts
@@ -64,8 +64,8 @@ describe('Test peertube-runner program client CLI', function () {
   })
 
   after(async function () {
-    await cleanupTests([ server ])
-
     peertubeRunner.kill()
+
+    await cleanupTests([ server ])
   })
 })