diff --git a/zulip/integrations/bridge_with_matrix/matrix_bridge.py b/zulip/integrations/bridge_with_matrix/matrix_bridge.py
old mode 100644
new mode 100755
diff --git a/zulip/integrations/google/get-google-credentials b/zulip/integrations/google/get-google-credentials
old mode 100644
new mode 100755
diff --git a/zulip/tests/test_default_arguments.py b/zulip/tests/test_default_arguments.py
index c4f0e0b0..2a5b0732 100755
--- a/zulip/tests/test_default_arguments.py
+++ b/zulip/tests/test_default_arguments.py
@@ -1,9 +1,6 @@
-#!/usr/bin/env python3
-
 import argparse
 import io
 import os
-import unittest
 from unittest import TestCase
 from unittest.mock import patch
 
@@ -43,7 +40,3 @@ Zulip API configuration:
             str(cm.exception),
             f"api_key or email not specified and file {expanded_test_path} does not exist",
         )
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/zulip/tests/test_hash_util_decode.py b/zulip/tests/test_hash_util_decode.py
index 9129226f..f3d70e5e 100644
--- a/zulip/tests/test_hash_util_decode.py
+++ b/zulip/tests/test_hash_util_decode.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python3
-
-import unittest
 from unittest import TestCase
 
 import zulip
@@ -19,7 +16,3 @@ class TestHashUtilDecode(TestCase):
         for encoded_string, decoded_string in tests:
             with self.subTest(encoded_string=encoded_string):
                 self.assertEqual(zulip.hash_util_decode(encoded_string), decoded_string)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/zulip/zulip/api_examples.py b/zulip/zulip/api_examples.py
old mode 100644
new mode 100755
diff --git a/zulip/zulip/examples/get-history b/zulip/zulip/examples/get-history
old mode 100644
new mode 100755
diff --git a/zulip_bots/setup.py b/zulip_bots/setup.py
index 5a9cf984..1c37d823 100644
--- a/zulip_bots/setup.py
+++ b/zulip_bots/setup.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 from setuptools import find_packages, setup
 
 ZULIP_BOTS_VERSION = "0.8.2"
diff --git a/zulip_bots/zulip_bots/bot_shell.py b/zulip_bots/zulip_bots/bot_shell.py
old mode 100644
new mode 100755
diff --git a/zulip_bots/zulip_bots/tests/test_run.py b/zulip_bots/zulip_bots/tests/test_run.py
index 2adc5806..ead3f88a 100644
--- a/zulip_bots/zulip_bots/tests/test_run.py
+++ b/zulip_bots/zulip_bots/tests/test_run.py
@@ -1,7 +1,5 @@
-#!/usr/bin/env python3
 import os
 import sys
-import unittest
 from pathlib import Path
 from typing import Optional
 from unittest import TestCase, mock
@@ -149,7 +147,3 @@ class TestBotLib(TestCase):
         test_message("nomention", "foo", None)
         test_message("Max Mustermann", "@**Max Mustermann** foo", "foo")
         test_message(r"Max (Mustermann)#(*$&12]\]", r"@**Max (Mustermann)#(*$&12]\]** foo", "foo")
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/zulip_botserver/setup.py b/zulip_botserver/setup.py
index 49e27b42..cb750d16 100644
--- a/zulip_botserver/setup.py
+++ b/zulip_botserver/setup.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 from setuptools import find_packages, setup
 
 ZULIP_BOTSERVER_VERSION = "0.8.2"
diff --git a/zulip_botserver/tests/test_server.py b/zulip_botserver/tests/test_server.py
index ec068f87..580202f2 100644
--- a/zulip_botserver/tests/test_server.py
+++ b/zulip_botserver/tests/test_server.py
@@ -1,6 +1,5 @@
 import json
 import os
-import unittest
 from collections import OrderedDict
 from importlib import import_module
 from pathlib import Path
@@ -311,7 +310,3 @@ class BotServerTests(BotServerTestCase):
         mock_app.config.__setitem__.assert_any_call(
             "BOTS_LIB_MODULES", {"packaged_bot": packaged_bot_module}
         )
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/zulip_botserver/zulip_botserver/server.py b/zulip_botserver/zulip_botserver/server.py
old mode 100644
new mode 100755