diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
index eb6e4ca83..befc7a0f3 100644
--- a/.github/workflows/test-python.yml
+++ b/.github/workflows/test-python.yml
@@ -63,6 +63,7 @@ jobs:
           dates
           datetimes
           db_functions
+          dbshell_
           delete
           delete_regress
           empty
diff --git a/pyproject.toml b/pyproject.toml
index d06978083..d41371041 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -37,7 +37,6 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-test = ["pytest>=7"]
 docs = [ "sphinx>=7"]
 
 [project.urls]
@@ -49,18 +48,6 @@ Tracker = "https://github.com/mongodb-labs/django-mongodb/issues"
 [tool.setuptools.dynamic]
 version = {attr = "django_mongodb.__version__"}
 
-[tool.pytest.ini_options]
-minversion = "7"
-addopts = ["-ra", "--strict-config", "--strict-markers", "--junitxml=xunit-results/TEST-results.xml"]
-testpaths = ["test"]
-log_cli_level = "INFO"
-norecursedirs = ["test/*"]
-faulthandler_timeout = 1500
-xfail_strict = true
-filterwarnings = [
-    "error"
-]
-
 [tool.mypy]
 strict = true
 show_error_codes = true
@@ -87,7 +74,6 @@ select = [
   "PGH",         # pygrep-hooks
   "PIE",         # flake8-pie
   "PL",          # pylint
-  "PT",          # flake8-pytest-style
   "PTH",         # flake8-use-pathlib
   "RET",         # flake8-return
   "RUF",         # Ruff-specific
diff --git a/test/test_basic.py b/test/test_basic.py
deleted file mode 100644
index 22e782564..000000000
--- a/test/test_basic.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from __future__ import annotations
-
-
-def test_basic():
-    pass
diff --git a/tests/dbshell_/__init__.py b/tests/dbshell_/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/dbshell_/tests.py b/tests/dbshell_/tests.py
new file mode 100644
index 000000000..e85f25d21
--- /dev/null
+++ b/tests/dbshell_/tests.py
@@ -0,0 +1,116 @@
+import signal
+from unittest import mock
+
+from django.db import connection
+from django.test import SimpleTestCase
+
+from django_mongodb.client import DatabaseClient
+
+
+class MongoDbshellTests(SimpleTestCase):
+    def settings_to_cmd_args_env(self, settings_dict, parameters=None):
+        if parameters is None:
+            parameters = []
+        return DatabaseClient.settings_to_cmd_args_env(settings_dict, parameters)
+
+    def test_fails_with_keyerror_on_incomplete_config(self):
+        with self.assertRaises(KeyError):
+            self.settings_to_cmd_args_env({})
+
+    def test_basic_params_specified_in_settings(self):
+        for options_parameters in [(None, None, None), ("value1", "value2", True)]:
+            with self.subTest(keys=options_parameters):
+                authentication_database, authentication_mechanism, retry_writes = options_parameters
+                if authentication_database is not None:
+                    expected_args = [
+                        "mongosh",
+                        "--host",
+                        "somehost",
+                        "--port",
+                        444,
+                        "--username",
+                        "someuser",
+                        "--password",
+                        "somepassword",
+                        "--retryWrites",
+                        "true",
+                        "somedbname",
+                    ]
+                else:
+                    expected_args = [
+                        "mongosh",
+                        "--host",
+                        "somehost",
+                        "--port",
+                        444,
+                        "--username",
+                        "someuser",
+                        "--password",
+                        "somepassword",
+                        "somedbname",
+                    ]
+
+                self.assertEqual(
+                    self.settings_to_cmd_args_env(
+                        {
+                            "NAME": "somedbname",
+                            "USER": "someuser",
+                            "PASSWORD": "somepassword",
+                            "HOST": "somehost",
+                            "PORT": 444,
+                            "OPTIONS": {
+                                "authenticationDatabase": authentication_database,
+                                "authenticationMechanism": authentication_mechanism,
+                                "retryWrites": retry_writes,
+                            },
+                        }
+                    ),
+                    (expected_args, None),
+                )
+
+    def test_options_override_settings_proper_values(self):
+        settings_port = 444
+        options_port = 555
+        self.assertNotEqual(settings_port, options_port, "test pre-req")
+        expected_args = [
+            "mongosh",
+            "--host",
+            "settinghost",
+            "--port",
+            444,
+            "--username",
+            "settinguser",
+            "--password",
+            "settingpassword",
+            "settingdbname",
+        ]
+        expected_env = None
+
+        self.assertEqual(
+            self.settings_to_cmd_args_env(
+                {
+                    "NAME": "settingdbname",
+                    "USER": "settinguser",
+                    "PASSWORD": "settingpassword",
+                    "HOST": "settinghost",
+                    "PORT": settings_port,
+                    "OPTIONS": {"port": options_port},
+                }
+            ),
+            (expected_args, expected_env),
+        )
+
+    def test_sigint_handler(self):
+        """SIGINT is ignored in Python and passed to Mongodb to abort queries."""
+
+        def _mock_subprocess_run(*args, **kwargs):  # noqa: ARG001
+            handler = signal.getsignal(signal.SIGINT)
+            self.assertEqual(handler, signal.SIG_IGN)
+
+        sigint_handler = signal.getsignal(signal.SIGINT)
+        # The default handler isn't SIG_IGN.
+        self.assertNotEqual(sigint_handler, signal.SIG_IGN)
+        with mock.patch("subprocess.run", new=_mock_subprocess_run):
+            connection.client.runshell([])
+        # dbshell restores the original handler.
+        self.assertEqual(sigint_handler, signal.getsignal(signal.SIGINT))