diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml
index afeae4577..e1302ddfe 100644
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@@ -26,6 +26,10 @@ jobs:
     - name: Install etherpad plugins
       run: npm install ep_align@0.2.27
 
+      # Nuke plugin tests
+    - name: Install etherpad plugins
+      run: rm -Rf node_modules/ep_align/static/tests/*
+
     - name: export GIT_HASH to env
       id: environment
       run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
diff --git a/src/tests/frontend/specs/adminsettings.js b/src/tests/frontend/specs/adminsettings.js
index 726848cc4..28675f656 100644
--- a/src/tests/frontend/specs/adminsettings.js
+++ b/src/tests/frontend/specs/adminsettings.js
@@ -1,7 +1,7 @@
 'use strict';
 
 describe('Admin > Settings', function () {
-  this.timeout(360000);
+  this.timeout(480000);
 
   before(async function () {
     let success = false;
@@ -51,7 +51,7 @@ describe('Admin > Settings', function () {
     // settings should have the old value
     helper.newAdmin('settings');
     await helper.waitForPromise(
-        () => helper.admin$ && helper.admin$('.settings').val().length > 0, 18000);
+        () => helper.admin$ && helper.admin$('.settings').val().length > 0, 36000);
     expect(settings).to.be(helper.admin$('.settings').val());
   });
 
@@ -67,7 +67,7 @@ describe('Admin > Settings', function () {
     helper.admin$('#restartEtherpad').click();
 
     // Hacky...  Other suggestions welcome..
-    await timeout(50000);
+    await timeout(200000);
     let success = false;
     $.ajax({
       url: `${location.protocol}//admin:changeme@${location.hostname}:${location.port}/admin`,