diff --git a/images/macos/provision/core/pipx-packages.sh b/images/macos/provision/core/pipx-packages.sh
index c01a4b975..b755dede5 100644
--- a/images/macos/provision/core/pipx-packages.sh
+++ b/images/macos/provision/core/pipx-packages.sh
@@ -8,18 +8,11 @@ pipx_packages=$(jq -r ".pipx[] .package" $toolset)
 for package in $pipx_packages; do
     python_version=$(jq -r ".pipx[] | select(.package == \"$package\") .python" $toolset)
     if [ "$python_version" != "null" ]; then
-        python_path="/opt/hostedtoolcache/Python/$python_version*/x64/bin/python$python_version"
+        python_path="$HOME/hostedtoolcache/Python/$python_version*/x64/bin/python$python_version"
         echo "Install $package into python $python_path"
         pipx install $package --python $python_path
     else
         echo "Install $package into default python"
         pipx install $package
     fi
-
-    # Run tests to determine that the software installed as expected
-    cmd=$(jq -r ".pipx[] | select(.package == \"$package\") .cmd" $toolset)
-    if ! command -v $cmd; then
-        echo "$package was not installed"
-        exit 1
-    fi
 done
\ No newline at end of file
diff --git a/images/macos/provision/core/python.sh b/images/macos/provision/core/python.sh
index 5bda9ef30..0c4058e31 100755
--- a/images/macos/provision/core/python.sh
+++ b/images/macos/provision/core/python.sh
@@ -13,11 +13,10 @@ FORMULA_PATH=$(/usr/local/bin/brew extract python@2 local/python2 | grep "Homebr
 /usr/local/bin/brew install $FORMULA_PATH
 
 echo "Installing pipx"
-export PIPX_BIN_DIR=/opt/pipx_bin
-export PIPX_HOME=/opt/pipx
+export PIPX_BIN_DIR=/usr/local/opt/pipx_bin
+export PIPX_HOME=/usr/local/opt/pipx
 
 brew install pipx
-python3 -m pipx ensurepath
 
 echo "export PIPX_BIN_DIR=${PIPX_BIN_DIR}" >> "${HOME}/.bashrc"
 echo "export PIPX_HOME=${PIPX_HOME}" >> "${HOME}/.bashrc"
diff --git a/images/macos/tests/Python.Tests.ps1 b/images/macos/tests/Python.Tests.ps1
index 76cd8941b..43dc122ab 100644
--- a/images/macos/tests/Python.Tests.ps1
+++ b/images/macos/tests/Python.Tests.ps1
@@ -31,4 +31,8 @@ Describe "Python" {
     It "Pip 3 is available" {
         "pip3 --version" | Should -ReturnZeroExitCode
     }
+
+    It "Pipx is available" {
+        "pipx --version" | Should -ReturnZeroExitCode
+    }
 }
\ No newline at end of file