diff --git a/R/TealAppDriver.R b/R/TealAppDriver.R
index 3130b78a58..c3426d4965 100644
--- a/R/TealAppDriver.R
+++ b/R/TealAppDriver.R
@@ -16,8 +16,20 @@ TealAppDriver <- R6::R6Class( # nolint: object_name.
     #' Initialize a `TealAppDriver` object for testing a `teal` application.
     #'
     #' @param data,modules,filter,title,header,footer arguments passed to `init`
+    #' @param timeout (`numeric`) Default number of milliseconds for any timeout or
+    #' timeout_ parameter in the `TealAppDriver` class.
+    #' Defaults to 20s.
+    #'
+    #' See [`shinytest2::AppDriver`] `new` method for more details on how to change it
+    #' via options or environment variables.
+    #' @param load_timeout (`numeric`) How long to wait for the app to load, in ms.
+    #' This includes the time to start R. Defaults to 100s.
+    #'
+    #' See [`shinytest2::AppDriver`] `new` method for more details on how to change it
+    #' via options or environment variables
     #' @param ... Additional arguments to be passed to `shinytest2::AppDriver$new`
     #'
+    #'
     #' @return  Object of class `TealAppDriver`
     initialize = function(data,
                           modules,
@@ -25,6 +37,8 @@ TealAppDriver <- R6::R6Class( # nolint: object_name.
                           title = build_app_title(),
                           header = tags$p(),
                           footer = tags$p(),
+                          timeout = rlang::missing_arg(),
+                          load_timeout = rlang::missing_arg(),
                           ...) {
       private$data <- data
       private$modules <- modules
@@ -37,16 +51,29 @@ TealAppDriver <- R6::R6Class( # nolint: object_name.
         header = header,
         footer = footer
       )
+
+      # Default timeout is hardcoded to 4s in shinytest2:::resolve_timeout
+      # It must be set as parameter to the AppDriver
       suppressWarnings(
         super$initialize(
-          shinyApp(app$ui, app$server),
+          app_dir = shinyApp(app$ui, app$server),
           name = "teal",
           variant = platform_variant(),
+          timeout = rlang::maybe_missing(timeout, 20 * 1000),
+          load_timeout = rlang::maybe_missing(load_timeout, 100 * 1000),
           ...
         )
       )
 
       private$set_active_ns()
+      self$wait_for_idle()
+    },
+    #' @description
+    #' Append parent [`shinytest2::AppDriver`] `click` method with a call to `waif_for_idle()` method.
+    #' @param ... arguments passed to parent [`shinytest2::AppDriver`] `click()` method.
+    click = function(...) {
+      super$click(...)
+      self$wait_for_idle()
     },
     #' @description
     #' Check if the app has shiny errors. This checks for global shiny errors.
@@ -112,7 +139,7 @@ TealAppDriver <- R6::R6Class( # nolint: object_name.
         )
         root <- sprintf("%s-%s", private$modules$label, get_unique_labels(tab))
       }
-      self$wait_for_idle(timeout = private$idle_timeout)
+      self$wait_for_idle()
       private$set_active_ns()
       invisible(self)
     },
@@ -444,8 +471,6 @@ TealAppDriver <- R6::R6Class( # nolint: object_name.
       module = character(0),
       filter_panel = character(0)
     ),
-    idle_timeout = 20000, # 20 seconds
-    load_timeout = 100000, # 100 seconds
     # private methods ----
     set_active_ns = function() {
       all_inputs <- self$get_values()$input
diff --git a/man/TealAppDriver.Rd b/man/TealAppDriver.Rd
index 3a3e482dbc..0d2e8bb556 100644
--- a/man/TealAppDriver.Rd
+++ b/man/TealAppDriver.Rd
@@ -20,6 +20,7 @@ driving a teal application for performing interactions for \code{shinytest2} tes
 \subsection{Public methods}{
 \itemize{
 \item \href{#method-TealAppDriver-new}{\code{TealAppDriver$new()}}
+\item \href{#method-TealAppDriver-click}{\code{TealAppDriver$click()}}
 \item \href{#method-TealAppDriver-expect_no_shiny_error}{\code{TealAppDriver$expect_no_shiny_error()}}
 \item \href{#method-TealAppDriver-expect_no_validation_error}{\code{TealAppDriver$expect_no_validation_error()}}
 \item \href{#method-TealAppDriver-expect_validation_error}{\code{TealAppDriver$expect_validation_error()}}
@@ -48,7 +49,6 @@ driving a teal application for performing interactions for \code{shinytest2} tes
 \if{html}{\out{
 <details><summary>Inherited methods</summary>
 <ul>
-<li><span class="pkg-link" data-pkg="shinytest2" data-topic="AppDriver" data-id="click"><a href='../../shinytest2/html/AppDriver.html#method-AppDriver-click'><code>shinytest2::AppDriver$click()</code></a></span></li>
 <li><span class="pkg-link" data-pkg="shinytest2" data-topic="AppDriver" data-id="expect_download"><a href='../../shinytest2/html/AppDriver.html#method-AppDriver-expect_download'><code>shinytest2::AppDriver$expect_download()</code></a></span></li>
 <li><span class="pkg-link" data-pkg="shinytest2" data-topic="AppDriver" data-id="expect_html"><a href='../../shinytest2/html/AppDriver.html#method-AppDriver-expect_html'><code>shinytest2::AppDriver$expect_html()</code></a></span></li>
 <li><span class="pkg-link" data-pkg="shinytest2" data-topic="AppDriver" data-id="expect_js"><a href='../../shinytest2/html/AppDriver.html#method-AppDriver-expect_js'><code>shinytest2::AppDriver$expect_js()</code></a></span></li>
@@ -95,6 +95,8 @@ Initialize a \code{TealAppDriver} object for testing a \code{teal} application.
   title = build_app_title(),
   header = tags$p(),
   footer = tags$p(),
+  timeout = rlang::missing_arg(),
+  load_timeout = rlang::missing_arg(),
   ...
 )}\if{html}{\out{</div>}}
 }
@@ -104,6 +106,19 @@ Initialize a \code{TealAppDriver} object for testing a \code{teal} application.
 \describe{
 \item{\code{data, modules, filter, title, header, footer}}{arguments passed to \code{init}}
 
+\item{\code{timeout}}{(\code{numeric}) Default number of milliseconds for any timeout or
+timeout_ parameter in the \code{TealAppDriver} class.
+Defaults to 20s.
+
+See \code{\link[shinytest2:AppDriver]{shinytest2::AppDriver}} \code{new} method for more details on how to change it
+via options or environment variables.}
+
+\item{\code{load_timeout}}{(\code{numeric}) How long to wait for the app to load, in ms.
+This includes the time to start R. Defaults to 100s.
+
+See \code{\link[shinytest2:AppDriver]{shinytest2::AppDriver}} \code{new} method for more details on how to change it
+via options or environment variables}
+
 \item{\code{...}}{Additional arguments to be passed to \code{shinytest2::AppDriver$new}}
 }
 \if{html}{\out{</div>}}
@@ -113,6 +128,23 @@ Object of class \code{TealAppDriver}
 }
 }
 \if{html}{\out{<hr>}}
+\if{html}{\out{<a id="method-TealAppDriver-click"></a>}}
+\if{latex}{\out{\hypertarget{method-TealAppDriver-click}{}}}
+\subsection{Method \code{click()}}{
+Append parent \code{\link[shinytest2:AppDriver]{shinytest2::AppDriver}} \code{click} method with a call to \code{waif_for_idle()} method.
+\subsection{Usage}{
+\if{html}{\out{<div class="r">}}\preformatted{TealAppDriver$click(...)}\if{html}{\out{</div>}}
+}
+
+\subsection{Arguments}{
+\if{html}{\out{<div class="arguments">}}
+\describe{
+\item{\code{...}}{arguments passed to parent \code{\link[shinytest2:AppDriver]{shinytest2::AppDriver}} \code{click()} method.}
+}
+\if{html}{\out{</div>}}
+}
+}
+\if{html}{\out{<hr>}}
 \if{html}{\out{<a id="method-TealAppDriver-expect_no_shiny_error"></a>}}
 \if{latex}{\out{\hypertarget{method-TealAppDriver-expect_no_shiny_error}{}}}
 \subsection{Method \code{expect_no_shiny_error()}}{
diff --git a/tests/testthat/helper-shinytest2.R b/tests/testthat/helper-shinytest2.R
index bf90d956f8..f5c298ac40 100644
--- a/tests/testthat/helper-shinytest2.R
+++ b/tests/testthat/helper-shinytest2.R
@@ -1,8 +1,6 @@
 library(shinytest2)
 library(rvest)
 
-default_idle_timeout <- 20000
-
 simple_teal_data <- function() {
   data <- within(teal_data(), {
     iris <- iris
diff --git a/tests/testthat/test-shinytest2-filter_panel.R b/tests/testthat/test-shinytest2-filter_panel.R
index 6af0a4bb89..2f65f29b91 100644
--- a/tests/testthat/test-shinytest2-filter_panel.R
+++ b/tests/testthat/test-shinytest2-filter_panel.R
@@ -14,8 +14,6 @@ testthat::test_that("e2e: module content is updated when a data is filtered in f
     )
   )
 
-  app$wait_for_idle(timeout = default_idle_timeout)
-
   old_output <- app$get_active_module_output("text")
 
   app$set_active_filter_selection("iris", "Species", c("setosa", "versicolor"))
@@ -47,20 +45,16 @@ testthat::test_that("e2e: filtering a module-specific filter is refected in othe
     )
   )
 
-  app$wait_for_idle(timeout = default_idle_timeout)
-
   expect_equal(
     app$get_active_data_filters("iris")$Species,
     c("setosa", "versicolor", "virginica")
   )
 
   app$navigate_teal_tab("Module_2")
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   app$set_active_filter_selection("iris", "Species", c("setosa"))
 
   app$navigate_teal_tab("Module_1")
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   expect_equal(
     app$get_active_data_filters("iris")$Species,
@@ -90,20 +84,16 @@ testthat::test_that("e2e: filtering a module-specific filter is not refected in
     )
   )
 
-  app$wait_for_idle(timeout = default_idle_timeout)
-
   expect_equal(
     app$get_active_data_filters("mtcars")$cyl,
     c("4", "6")
   )
 
   app$navigate_teal_tab("Module_2")
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   app$set_active_filter_selection("mtcars", "cyl", c("4"))
 
   app$navigate_teal_tab("Module_1")
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   expect_equal(
     app$get_active_data_filters("mtcars")$cyl,
diff --git a/tests/testthat/test-shinytest2-init.R b/tests/testthat/test-shinytest2-init.R
index c070d7b539..9f57bfa904 100644
--- a/tests/testthat/test-shinytest2-init.R
+++ b/tests/testthat/test-shinytest2-init.R
@@ -4,7 +4,6 @@ testthat::test_that("e2e: teal app initializes with no errors", {
     data = simple_teal_data(),
     modules = example_module(label = "Example Module")
   )
-  app$wait_for_idle(timeout = default_idle_timeout)
   app$expect_no_shiny_error()
   app$stop()
 })
@@ -15,7 +14,6 @@ testthat::test_that("e2e: teal app initializes with sessionInfo modal", {
     data = simple_teal_data(),
     modules = example_module(label = "Example Module")
   )
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   # Check if button exists.
   button_selector <- "#teal-sessionInfo-button"
@@ -25,7 +23,6 @@ testthat::test_that("e2e: teal app initializes with sessionInfo modal", {
   )
 
   app$click(selector = button_selector)
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   # Check header and title content.
   testthat::expect_equal(
@@ -82,7 +79,6 @@ testthat::test_that("e2e: init creates UI containing specified title, favicon, h
     header = app_header,
     footer = app_footer
   )
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   testthat::expect_equal(
     app$get_text("head > title")[1],
diff --git a/tests/testthat/test-shinytest2-landing_popup.R b/tests/testthat/test-shinytest2-landing_popup.R
index c1d3826dbc..adaa82c19a 100644
--- a/tests/testthat/test-shinytest2-landing_popup.R
+++ b/tests/testthat/test-shinytest2-landing_popup.R
@@ -11,7 +11,6 @@ testthat::test_that("e2e: teal app with landing_popup_module initializes with no
     )
   )
 
-  app$wait_for_idle(timeout = default_idle_timeout)
   testthat::expect_equal(
     app$get_text("#landingpopup b"),
     "A welcome message!"
@@ -28,7 +27,6 @@ testthat::test_that("e2e: app with default landing_popup_module creates modal co
       example_module()
     )
   )
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   testthat::expect_equal(
     app$get_text("#shiny-modal-wrapper button"),
@@ -47,11 +45,9 @@ testthat::test_that("e2e: when default landing_popup_module is closed, it shows
       example_module()
     )
   )
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   # Button is clicked.
   app$click(selector = "#shiny-modal-wrapper button[data-dismiss='modal']")
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   # There is no more modal displayed.
   testthat::expect_null(app$get_html("#shiny-modal-wrapper"))
@@ -104,8 +100,6 @@ testthat::test_that(
       )
     )
 
-    app$wait_for_idle(timeout = default_idle_timeout)
-
     testthat::expect_equal(
       app$get_text(".modal-title"),
       modal_title
@@ -157,7 +151,6 @@ testthat::test_that("e2e: when customized button in landing_popup_module is clic
       example_module()
     )
   )
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   testthat::expect_equal(
     app$get_attr("#read", "onclick"),
diff --git a/tests/testthat/test-shinytest2-modules.R b/tests/testthat/test-shinytest2-modules.R
index e547fdd397..536f09f2b9 100644
--- a/tests/testthat/test-shinytest2-modules.R
+++ b/tests/testthat/test-shinytest2-modules.R
@@ -24,7 +24,7 @@ testthat::test_that("e2e: the module server logic is only triggered when the tea
       value_export_module(label = "Module 2")
     )
   )
-  app$wait_for_idle(timeout = default_idle_timeout)
+
   test_exports <- app$get_values()$export
 
   expect_equal(length(test_exports), 1)
@@ -45,7 +45,6 @@ testthat::test_that("e2e: filter panel only shows the data supplied using datana
       example_module(label = "mtcars", datanames = "mtcars")
     )
   )
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   testthat::expect_identical(
     app$get_active_filter_vars(),
@@ -62,7 +61,6 @@ testthat::test_that("e2e: filter panel shows all the datasets when datanames is
       example_module(label = "all", datanames = "all")
     )
   )
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   testthat::expect_identical(
     app$get_active_filter_vars(),
@@ -79,7 +77,6 @@ testthat::test_that("e2e: filter panel is not displayed when datanames is NULL",
       example_module(label = "NULL", datanames = NULL)
     )
   )
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   testthat::expect_identical(
     app$get_html_rvest(".teal_secondary_col") %>%
diff --git a/tests/testthat/test-shinytest2-reporter.R b/tests/testthat/test-shinytest2-reporter.R
index 46ba6f9bc9..77b6b190d8 100644
--- a/tests/testthat/test-shinytest2-reporter.R
+++ b/tests/testthat/test-shinytest2-reporter.R
@@ -46,10 +46,8 @@ testthat::test_that("e2e: adding a report card in a module adds it in the report
     data = simple_teal_data(),
     modules = report_module(label = "Module with Reporter")
   )
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   app$click(NS(app$active_module_ns(), "reporter-add_report_card_simple-add_report_card_button"))
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   app$set_input(
     NS(app$active_module_ns(), "reporter-add_report_card_simple-label"),
diff --git a/tests/testthat/test-shinytest2-show-rcode.R b/tests/testthat/test-shinytest2-show-rcode.R
index 09cc122080..383ed57b90 100644
--- a/tests/testthat/test-shinytest2-show-rcode.R
+++ b/tests/testthat/test-shinytest2-show-rcode.R
@@ -4,7 +4,6 @@ testthat::test_that("e2e: teal app initializes with Show R Code modal", {
     data = simple_teal_data(),
     modules = example_module(label = "Example Module")
   )
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   # Check if button exists.
   button_selector <- app$active_module_element("rcode-button")
@@ -14,7 +13,6 @@ testthat::test_that("e2e: teal app initializes with Show R Code modal", {
   )
 
   app$click(selector = button_selector)
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   # Check header and title content.
   testthat::expect_equal(
diff --git a/tests/testthat/test-shinytest2-teal_data_module.R b/tests/testthat/test-shinytest2-teal_data_module.R
index e830183981..87025f1542 100644
--- a/tests/testthat/test-shinytest2-teal_data_module.R
+++ b/tests/testthat/test-shinytest2-teal_data_module.R
@@ -25,12 +25,10 @@ testthat::test_that("e2e: teal_data_module will have a delayed load of datasets"
 
   app <- TealAppDriver$new(
     data = tdm,
-    modules = example_module(label = "Example Module"),
-    timeout = default_idle_timeout
+    modules = example_module(label = "Example Module")
   )
 
   app$click("teal_data_module-submit")
-  app$wait_for_idle()
   testthat::expect_setequal(app$get_active_filter_vars(), c("dataset1", "dataset2"))
 
   app$stop()
@@ -62,10 +60,8 @@ testthat::test_that("e2e: teal_data_module shows validation errors", {
 
   app <- TealAppDriver$new(
     data = tdm,
-    modules = example_module(label = "Example Module"),
-    timeout = default_idle_timeout
+    modules = example_module(label = "Example Module")
   )
-  app$wait_for_idle()
 
   app$click("teal_data_module-submit")
 
@@ -108,17 +104,15 @@ testthat::test_that("e2e: teal_data_module inputs change teal_data object that i
 
   app <- TealAppDriver$new(
     data = tdm,
-    modules = example_module(label = "Example Module"),
-    timeout = default_idle_timeout
+    modules = example_module(label = "Example Module")
   )
-  app$wait_for_idle()
+
   app$set_input("teal_data_module-new_column", "A_New_Column")
   app$click("teal_data_module-submit")
 
   # This may fail if teal_data_module does not perform the transformation
   testthat::expect_no_error(app$add_filter_var("dataset1", "A_New_Column"))
 
-  app$wait_for_idle()
   testthat::expect_setequal(
     app$get_active_data_filters("dataset1")$A_New_Column,
     unique(sprintf("%s new", iris$Species))
diff --git a/tests/testthat/test-shinytest2-teal_slices.R b/tests/testthat/test-shinytest2-teal_slices.R
index 119bd7526a..3797590074 100644
--- a/tests/testthat/test-shinytest2-teal_slices.R
+++ b/tests/testthat/test-shinytest2-teal_slices.R
@@ -14,8 +14,6 @@ testthat::test_that("e2e: teal_slices filters are initialized when global filter
     )
   )
 
-  app$wait_for_idle(timeout = default_idle_timeout)
-
   testthat::expect_identical(
     names(app$get_active_data_filters("iris")),
     "Species"
@@ -63,7 +61,6 @@ testthat::test_that("e2e: teal_slices filters are initialized when module specif
       )
     )
   )
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   testthat::expect_identical(
     names(app$get_active_data_filters("iris")),
@@ -86,7 +83,6 @@ testthat::test_that("e2e: teal_slices filters are initialized when module specif
   testthat::expect_null(app$get_active_data_filters("mtcars")$gear)
 
   app$navigate_teal_tab("Module_2")
-  app$wait_for_idle(timeout = default_idle_timeout)
 
   testthat::expect_identical(
     names(app$get_active_data_filters("iris")),
diff --git a/tests/testthat/test-shinytest2-utils.R b/tests/testthat/test-shinytest2-utils.R
index 20b3e9d0d3..30b0d2bef2 100644
--- a/tests/testthat/test-shinytest2-utils.R
+++ b/tests/testthat/test-shinytest2-utils.R
@@ -21,7 +21,6 @@ testthat::test_that("e2e: show/hide hamburger works as expected", {
   testthat::expect_false(isTruthy(secondary_attrs$style))
 
   app$click(selector = ".btn.action-button.filter_hamburger")
-  app$wait_for_idle(timeout = default_idle_timeout)
   primary_attrs <- get_class_attributes(app, ".teal_primary_col")
   secondary_attrs <- get_class_attributes(app, ".teal_secondary_col")