diff --git a/oonidata/pyproject.toml b/oonidata/pyproject.toml
index 169b0d4d..6b30e529 100644
--- a/oonidata/pyproject.toml
+++ b/oonidata/pyproject.toml
@@ -47,6 +47,9 @@ path = ".venv/"
 [tool.hatch.version]
 path = "src/oonidata/__about__.py"
 
+[project.scripts]
+oonidata = "oonidata.main:main"
+
 [tool.hatch.envs.default.scripts]
 oonidata = "python -m oonidata.main {args}"
 test = "pytest {args:tests}"
diff --git a/oonidata/src/oonidata/main.py b/oonidata/src/oonidata/main.py
index c9a14c81..6faf6088 100644
--- a/oonidata/src/oonidata/main.py
+++ b/oonidata/src/oonidata/main.py
@@ -1,9 +1,12 @@
 import multiprocessing as mp
 from oonidata.cli import cli
 
-if __name__ == "__main__":
+def main():
     # Use spawn to avoid race condition that leads to deadlocks on unix
     # See: https://bugs.python.org/issue6721
     mp.set_start_method("spawn")
 
     cli()
+
+if __name__ == "__main__":
+    main()