diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f05516e9234..b8bbee06707 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -233,7 +233,7 @@ jobs:
 
       - name: Plugin QUnit
         if: matrix.build_type == 'frontend' && matrix.target == 'plugins'
-        run: QUNIT_WRITE_EXECUTION_FILE=1 bin/rake plugin:qunit['*','1200000']
+        run: QUNIT_WRITE_EXECUTION_FILE=1 bin/rake plugin:qunit['*']
         timeout-minutes: 30
 
       - name: Theme QUnit
diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index 26eb945ffac..cb1a6021dcd 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -299,8 +299,6 @@ task "docker:test" do
       end
 
       unless ENV["RUBY_ONLY"]
-        js_timeout = ENV["JS_TIMEOUT"].presence || 900_000 # 15 minutes
-
         unless ENV["SKIP_CORE"]
           @good &&=
             run_or_fail(
@@ -310,14 +308,11 @@ task "docker:test" do
 
         unless ENV["SKIP_PLUGINS"]
           if ENV["SINGLE_PLUGIN"]
-            @good &&=
-              run_or_fail(
-                "CI=1 bundle exec rake plugin:qunit['#{ENV["SINGLE_PLUGIN"]}','#{js_timeout}']",
-              )
+            @good &&= run_or_fail("CI=1 bundle exec rake plugin:qunit['#{ENV["SINGLE_PLUGIN"]}']")
           else
             @good &&=
               run_or_fail(
-                "QUNIT_PARALLEL=#{qunit_concurrency}  CI=1 bundle exec rake plugin:qunit['*','#{js_timeout}']",
+                "QUNIT_PARALLEL=#{qunit_concurrency} CI=1 bundle exec rake plugin:qunit['*']",
               )
           end
         end
diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake
index 6067ad94d88..d82975dd63b 100644
--- a/lib/tasks/plugin.rake
+++ b/lib/tasks/plugin.rake
@@ -221,7 +221,7 @@ task "plugin:turbo_spec", %i[plugin argv] do |_, args|
 end
 
 desc "run plugin qunit tests"
-task "plugin:qunit", %i[plugin timeout] do |t, args|
+task "plugin:qunit", :plugin do |t, args|
   args.with_defaults(plugin: "*")
 
   rake = "#{Rails.root}/bin/rake"
@@ -238,9 +238,7 @@ task "plugin:qunit", %i[plugin timeout] do |t, args|
     end
 
   cmd += "TARGET='#{target}' "
-
   cmd += "#{rake} qunit:test"
-  cmd += "[#{args[:timeout]}]" if args[:timeout]
 
   system cmd
   exit $?.exitstatus
diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake
index a1c071eab06..713a2ca97a4 100644
--- a/lib/tasks/qunit.rake
+++ b/lib/tasks/qunit.rake
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 desc "Runs the qunit test suite"
-task "qunit:test", %i[timeout qunit_path filter] do |_, args|
+task "qunit:test", %i[qunit_path filter] do |_, args|
   require "socket"
   require "chrome_installed_checker"
 
diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake
index 4b5cd45fc57..6afe7270e19 100644
--- a/lib/tasks/themes.rake
+++ b/lib/tasks/themes.rake
@@ -146,7 +146,7 @@ task "themes:qunit", :type, :value do |t, args|
   ENV["THEME_#{type.upcase}"] = value.to_s
   ENV["QUNIT_RAILS_ENV"] ||= "development" # qunit:test will switch to `test` by default
   Rake::Task["qunit:test"].reenable
-  Rake::Task["qunit:test"].invoke(1_200_000, "/theme-qunit")
+  Rake::Task["qunit:test"].invoke("/theme-qunit")
 end
 
 desc "Install a theme/component on a temporary DB and run QUnit tests"