diff --git a/src/catkin_pkg/cli/create_pkg.py b/src/catkin_pkg/cli/create_pkg.py
index 6626b533..2ef39442 100644
--- a/src/catkin_pkg/cli/create_pkg.py
+++ b/src/catkin_pkg/cli/create_pkg.py
@@ -68,3 +68,7 @@ def main(argv=sys.argv[1:], parent_path=os.getcwd()):
         print('Successfully created files in %s. Please adjust the values in package.xml.' % target_path)
     except ValueError as vae:
         parser.error(str(vae))
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/src/catkin_pkg/cli/find_pkg.py b/src/catkin_pkg/cli/find_pkg.py
index 726ebed0..913b54fc 100644
--- a/src/catkin_pkg/cli/find_pkg.py
+++ b/src/catkin_pkg/cli/find_pkg.py
@@ -27,3 +27,7 @@ def main(argv=sys.argv[1:]):
     except RuntimeError as e:
         print('ERROR: ' + str(e), file=sys.stderr)
         sys.exit(1)
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/src/catkin_pkg/cli/generate_changelog.py b/src/catkin_pkg/cli/generate_changelog.py
index 08229918..f856d93d 100644
--- a/src/catkin_pkg/cli/generate_changelog.py
+++ b/src/catkin_pkg/cli/generate_changelog.py
@@ -135,3 +135,7 @@ def main_catching_runtime_error(*args, **kwargs):
     except RuntimeError as e:
         print('ERROR: ' + str(e), file=sys.stderr)
         sys.exit(1)
+
+
+if __name__ == '__main__':
+    sys.exit(main_catching_runtime_error())
diff --git a/src/catkin_pkg/cli/package_version.py b/src/catkin_pkg/cli/package_version.py
index 62eee185..613218b2 100644
--- a/src/catkin_pkg/cli/package_version.py
+++ b/src/catkin_pkg/cli/package_version.py
@@ -37,3 +37,7 @@ def main():
             print('%s -> %s' % (version, new_version))
     except Exception as e:  # noqa: B902
         sys.exit(str(e))
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/src/catkin_pkg/cli/prepare_release.py b/src/catkin_pkg/cli/prepare_release.py
index b7b5c9a4..b4decbc5 100644
--- a/src/catkin_pkg/cli/prepare_release.py
+++ b/src/catkin_pkg/cli/prepare_release.py
@@ -449,3 +449,7 @@ def _main():
             print(fmt('@{yf}%s' % msg))
         else:
             raise RuntimeError(fmt('@{rf}%s' % msg))
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/src/catkin_pkg/cli/tag_changelog.py b/src/catkin_pkg/cli/tag_changelog.py
index 311c7dba..b0573432 100644
--- a/src/catkin_pkg/cli/tag_changelog.py
+++ b/src/catkin_pkg/cli/tag_changelog.py
@@ -112,3 +112,7 @@ def main(sysargs=None):
     for (changelog_path, data) in new_changelog_data:
         with open(changelog_path, 'wb') as f:
             f.write(data.encode('utf-8'))
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/src/catkin_pkg/cli/test_changelog.py b/src/catkin_pkg/cli/test_changelog.py
index 0c2aa8b0..d40302aa 100644
--- a/src/catkin_pkg/cli/test_changelog.py
+++ b/src/catkin_pkg/cli/test_changelog.py
@@ -44,3 +44,7 @@ def main(sysargs=None):
     changelog = Changelog()
     with open(changelog_file, 'r') as f:
         print(populate_changelog_from_rst(changelog, f.read()))
+
+
+if __name__ == '__main__':
+    sys.exit(main())