diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 65c2ca6..fd8ff6b 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -2,6 +2,10 @@ name: Appium Tests
 
 on: [push, pull_request, workflow_dispatch]
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   settings-tests:
     name: Settings Tests
diff --git a/.mocharc.json b/.mocharc.json
index 4bfc2b7..1b67fd5 100644
--- a/.mocharc.json
+++ b/.mocharc.json
@@ -6,7 +6,7 @@
         "ts"
     ],
     "spec": "src/tests/**/*.ts",
-    "timeout": 50000,
+    "timeout": 500000,
     "watch-files": [
         "src/tests/**/*.ts"
     ],