diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index f18ede7..f1b5f57 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -36,6 +36,10 @@ jobs:
       - name: Install test dependencies
         run: |
           python -m pip install .[test]
+      - name: Test pipx installation
+        run: |
+          python -m pip install pipx
+          pipx install .
       - name: Lint with flake8
         run: |
           flake8 piglot test
diff --git a/pyproject.toml b/pyproject.toml
index 4f8b9fe..19e6519 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -50,9 +50,9 @@ test = ["pytest", "pytest-cov", "flake8", "coverage"]
 "Bug Reports" = "https://github.com/CM2S/piglot/issues"
 "Source" = "https://github.com/CM2S/piglot/"
 
-[project.entry-points."piglot.bin"]
-piglot = "piglot:main"
-piglot-plot = "piglot_plot:main"
+[project.scripts]
+piglot = "piglot.bin.piglot:main"
+piglot-plot = "piglot.bin.piglot_plot:main"
 
 [build-system]
 requires = ["setuptools>=61.0.0", "wheel"] # Needed for dynamic version