diff --git a/.gitignore b/.gitignore
index 5ed949e..b674b0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
-# quick test
-quick.ps1
-
 lib/*.psd1
 **/*.log
 
 config.psd1
+
+test-*.ps1
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 34f7679..3a83435 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -51,21 +51,9 @@
             "type": "PowerShell",
             "request": "launch",
             "cwd": "${workspaceRoot}",
-            "script": "${workspaceFolder}/tests/pre-commit.ps1",
+            "script": "${workspaceFolder}/tests/run.ps1",
             "args": [],
             "createTemporaryIntegratedConsole": true
         },
-        {
-            "name": "PowerShell: Launch Quick Test",
-            "type": "PowerShell",
-            "request": "launch",
-            "cwd": "${workspaceRoot}",
-            "script": "${workspaceFolder}/quick.ps1",
-            "args": [
-                "-Verbose",
-                "-Debug"
-            ],
-            "createTemporaryIntegratedConsole": true
-        }
     ]
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index acb42b0..8754d0b 100644
--- a/README.md
+++ b/README.md
@@ -557,16 +557,16 @@ Access to lower level polling functions are provided with these functions:
 
 ### Run tests
 
-Run tests using .\tests\pre-commit.ps1 which accepts the following parameters:
+Parameters:
 
 - `kind`: Run tests of this kind
 - `tag`: Run tests tagged with this marker (currently `higher` or `lower`)
-- `num`: Run this number of tests
-- `log`: Write summary log file
 
-Run tests from repository root in a subshell and write logs, like so:
+*with Task*
 
-`powershell .\tests\pre-commit.ps1 -k "potato" -t "higher" -log`
+```console
+task test -- -t "higher" -k "banana"
+```
 
 ### Official Documentation
 
diff --git a/Taskfile.yaml b/Taskfile.yaml
new file mode 100644
index 0000000..0e8ac22
--- /dev/null
+++ b/Taskfile.yaml
@@ -0,0 +1,11 @@
+version: '3'
+
+tasks:
+  test:
+    desc: 'Run tests'
+    preconditions:
+      - sh: 'pwsh -c "if ([System.Version](Get-InstalledModule Pester).Version.ToString() -gt [System.Version]"5.7.0") { exit 0 } else { exit 1 }"'
+        msg: 'Pester version must be greater than 5.7.0'
+    cmds:
+      - echo "Running tests..."
+      - pwsh -c "tests\run.ps1 {{.CLI_ARGS}}"