diff --git a/images/macos/tests/Linters.Tests.ps1 b/images/macos/tests/Linters.Tests.ps1
index 3b7b8e0d..31d3698c 100644
--- a/images/macos/tests/Linters.Tests.ps1
+++ b/images/macos/tests/Linters.Tests.ps1
@@ -3,10 +3,6 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
 $os = Get-OSVersion
 
 Describe "Linters" {
-    It "yamllint" {
-        "yamllint --version" | Should -ReturnZeroExitCode
-    }
-
     It "SwiftLint" -Skip:($os.IsHighSierra) {
         "swiftlint version" | Should -ReturnZeroExitCode
     }
diff --git a/images/macos/tests/PipxPackages.Tests.ps1 b/images/macos/tests/PipxPackages.Tests.ps1
new file mode 100644
index 00000000..ed981938
--- /dev/null
+++ b/images/macos/tests/PipxPackages.Tests.ps1
@@ -0,0 +1,7 @@
+Describe "PipxPackages" {
+    $pipxToolset = Get-ToolsetValue "pipx"
+    $testCases = $pipxToolset | ForEach-Object { @{package = $_.package; cmd = $_.cmd} }
+    It "<package>" -TestCases $testCases {
+        "$cmd" | Should -ReturnZeroExitCode
+    }
+}
\ No newline at end of file
diff --git a/images/macos/toolsets/toolset-10.13.json b/images/macos/toolsets/toolset-10.13.json
index f1ce3b06..3bf62968 100644
--- a/images/macos/toolsets/toolset-10.13.json
+++ b/images/macos/toolsets/toolset-10.13.json
@@ -198,7 +198,7 @@
     "pipx": [
         {
             "package": "yamllint",
-            "cmd": "yamllint"
+            "cmd": "yamllint --version"
         }
     ]
 }
\ No newline at end of file
diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json
index f1c70a83..aa1b4101 100644
--- a/images/macos/toolsets/toolset-10.14.json
+++ b/images/macos/toolsets/toolset-10.14.json
@@ -258,7 +258,7 @@
     "pipx": [
         {
             "package": "yamllint",
-            "cmd": "yamllint"
+            "cmd": "yamllint --version"
         }
     ]
 }
\ No newline at end of file
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index e2debc9f..c54db919 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -167,7 +167,7 @@
     "pipx": [
         {
             "package": "yamllint",
-            "cmd": "yamllint"
+            "cmd": "yamllint --version"
         }
     ]
 }
\ No newline at end of file
diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json
index e5cf3e64..ed8903d3 100644
--- a/images/macos/toolsets/toolset-11.0.json
+++ b/images/macos/toolsets/toolset-11.0.json
@@ -92,7 +92,7 @@
     "pipx": [
         {
             "package": "yamllint",
-            "cmd": "yamllint"
+            "cmd": "yamllint --version"
         }
     ]
 }
\ No newline at end of file