diff --git a/jupyterhub/tests/browser/test_share.py b/jupyterhub/tests/browser/test_share.py
index 9d86f757..8dfcb29c 100644
--- a/jupyterhub/tests/browser/test_share.py
+++ b/jupyterhub/tests/browser/test_share.py
@@ -52,12 +52,12 @@ async def test_share_code_flow_full(app, browser, full_spawn, create_user_with_s
     assert f"access {user.name}'s server" in header_text
     assert f"You ({share_user.name})" in header_text
     # TODO verify form
-    submit = browser.locator('//input[@type="submit"]')
+    submit = browser.locator('//button[@type="submit"]')
     await submit.click()
 
     # redirects to server, which triggers oauth approval
     await expect(browser).to_have_url(re.compile(r".*/oauth2/authorize"))
-    submit = browser.locator('//input[@type="submit"]')
+    submit = browser.locator('//button[@type="submit"]')
     await submit.click()
 
     # finally, we are at the server!
diff --git a/share/jupyterhub/templates/accept-share.html b/share/jupyterhub/templates/accept-share.html
index cb0fc91f..ae2ab51a 100644
--- a/share/jupyterhub/templates/accept-share.html
+++ b/share/jupyterhub/templates/accept-share.html
@@ -45,7 +45,7 @@
       <p>
         After accepting the invitation, you will be redirected to <a href="{{ next_url | safe }}">{{ next_url }}</a>.
       </p>
-      <input type="submit" value="Accept invitation" class="form-control btn-jupyter" />
+      <button type="submit" class="form-control btn btn-jupyter" >Accept invitation</button>
     </form>
   </div>
 </div></div></div>
diff --git a/share/jupyterhub/templates/spawn.html b/share/jupyterhub/templates/spawn.html
index e538fb36..5a80fc11 100644
--- a/share/jupyterhub/templates/spawn.html
+++ b/share/jupyterhub/templates/spawn.html
@@ -25,7 +25,7 @@
       {{spawner_options_form | safe}}
       <br>
       <div class="feedback-container">
-        <input type="submit" value="Start" class="btn btn-jupyter form-control">
+        <button type="submit" class="btn btn-jupyter form-control">Start</button>
         <div class="feedback-widget hidden">
           <i class="fa fa-spinner"></i>
         </div>
diff --git a/testing/jupyterhub_config.py b/testing/jupyterhub_config.py
index ac6dc24c..b530f95f 100644
--- a/testing/jupyterhub_config.py
+++ b/testing/jupyterhub_config.py
@@ -19,6 +19,7 @@ c.JupyterHub.bind_url = 'http://127.0.0.1:8000'
 # don't cache static files
 c.JupyterHub.tornado_settings = {
     "no_cache_static": True,
+    "slow_spawn_timeout": 0,
 }
 
 c.JupyterHub.allow_named_servers = True