Kaggle · stevemessick · Jun 24, 2026 · Jun 23, 2026 · Jun 24, 2026
diff --git a/integration_tests/__init__.py b/integration_tests/__init__.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -55,9 +55,9 @@ dependencies = [
 ]
 
 [tool.hatch.envs.test.scripts]
-local = "source tools/use-localhost.sh; cd tests; python unit_tests.py --failfast"
-prod = "source tools/use-prod.sh; cd tests; python unit_tests.py --failfast"
-integration = "pytest integration_tests"
+local = "source tools/use-localhost.sh; cd tests/backend; python backend_tests.py --failfast"
+prod = "source tools/use-prod.sh; cd tests/backend; python backend_tests.py --failfast"
+integration = "pytest tests/integration"
 
 [tool.hatch.envs.lint]
 detached = true
@@ -105,7 +105,6 @@ ignore_missing_imports = true
 
 [tool.pytest.ini_options]
 testpaths = [
-    "src/kaggle/test",
-    "tests",
+    "tests/unit",
 ]
 pythonpath = ["src"]
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/unit_tests.py → tests/backend/backend_tests.py b/tests/unit_tests.py → tests/backend/backend_tests.py
@@ -10,7 +10,7 @@
 from requests import HTTPError
 
 # noinspection PyTypeChecker
-sys.path.insert(0, "..")
+sys.path.insert(0, "../..")
 
 from kaggle import api
 from kagglesdk.kernels.types.kernels_enums import KernelWorkerStatus
@@ -23,8 +23,8 @@
 # In the case of unresolvable failure, run reset_database.sh.
 
 # To run from Rider, create a Python tests>Unittests run config.
-# Give it the module: unit_tests.TestKaggleApi
-# Set the working directory to: kaggle-cli/tests
+# Give it the module: backend_tests.TestKaggleApi
+# Set the working directory to: kaggle-cli/tests/backend
 # Define some envars:
 # KAGGLE_API_ENVIRONMENT=LOCALHOST
 # KAGGLE_CONFIG_DIR=/home/kaggle/.config/kaggle/dev

diff --git a/tests/dataset/data.csv → tests/backend/dataset/data.csv b/tests/dataset/data.csv → tests/backend/dataset/data.csv
diff --git a/tests/kernel/testing-x.ipynb → tests/backend/kernel/testing-x.ipynb b/tests/kernel/testing-x.ipynb → tests/backend/kernel/testing-x.ipynb
diff --git a/tests/model/instance/data.csv → tests/backend/model/instance/data.csv b/tests/model/instance/data.csv → tests/backend/model/instance/data.csv
diff --git a/tests/model/instance/version/metadata.json → ...kend/model/instance/version/metadata.json b/tests/model/instance/version/metadata.json → ...kend/model/instance/version/metadata.json
diff --git a/tests/sample_submission.csv → tests/backend/sample_submission.csv b/tests/sample_submission.csv → tests/backend/sample_submission.csv
diff --git a/integration_tests/test_models.py → tests/integration/test_models.py b/integration_tests/test_models.py → tests/integration/test_models.py
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
@@ -12,8 +12,8 @@ echo "Running fast unit tests with pytest..."
 
 # Run live integration tests only if stdin is a TTY (invoked interactively)
 if [ -t 0 ]; then
-  echo "Running live integration tests (unit_tests.py)..."
-  python3 -m unittest unit_tests.py
+  echo "Running live integration tests (backend_tests.py)..."
+  (cd "$SCRIPT_DIR/backend" && python3 -m unittest backend_tests.py)
 fi
 
 echo "All tests passed!"
diff --git a/src/kaggle/test/conftest.py → tests/unit/conftest.py b/src/kaggle/test/conftest.py → tests/unit/conftest.py
diff --git a/src/kaggle/test/test_authenticate.py → tests/unit/test_authenticate.py b/src/kaggle/test/test_authenticate.py → tests/unit/test_authenticate.py
diff --git a/src/kaggle/test/test_benchmarks_cli.py → tests/unit/test_benchmarks_cli.py b/src/kaggle/test/test_benchmarks_cli.py → tests/unit/test_benchmarks_cli.py
diff --git a/tests/test_dataset_metadata_update.py → tests/unit/test_dataset_metadata_update.py b/tests/test_dataset_metadata_update.py → tests/unit/test_dataset_metadata_update.py
@@ -8,7 +8,7 @@
 # Ensure parent directory is in path for imports
 import sys
 
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")))
 
 from kaggle.api.kaggle_api_extended import KaggleApi
 from kagglesdk.datasets.types.dataset_types import DatasetSettings, DatasetSettingsFile, DatasetSettingsFileColumn

diff --git a/tests/test_dataset_status.py → tests/unit/test_dataset_status.py b/tests/test_dataset_status.py → tests/unit/test_dataset_status.py
@@ -4,7 +4,7 @@
 from unittest.mock import MagicMock, patch
 import sys
 
-sys.path.insert(0, "..")
+sys.path.insert(0, "../..")
 
 from kaggle.api.kaggle_api_extended import KaggleApi, _parse_format
 

diff --git a/src/kaggle/test/test_discussions_cli.py → tests/unit/test_discussions_cli.py b/src/kaggle/test/test_discussions_cli.py → tests/unit/test_discussions_cli.py
diff --git a/tests/test_kernel_parsing.py → tests/unit/test_kernel_parsing.py b/tests/test_kernel_parsing.py → tests/unit/test_kernel_parsing.py
@@ -3,7 +3,7 @@
 import unittest
 from unittest.mock import patch
 
-sys.path.insert(0, "../src")
+sys.path.insert(0, "../../src")
 
 
 from kaggle.api.kaggle_api_extended import KaggleApi

diff --git a/tests/test_kernels_logs.py → tests/unit/test_kernels_logs.py b/tests/test_kernels_logs.py → tests/unit/test_kernels_logs.py
@@ -6,7 +6,7 @@
 import tempfile
 import sys
 
-sys.path.insert(0, "..")
+sys.path.insert(0, "../..")
 
 from kaggle.api.kaggle_api_extended import KaggleApi
 

diff --git a/tests/test_kernels_pull.py → tests/unit/test_kernels_pull.py b/tests/test_kernels_pull.py → tests/unit/test_kernels_pull.py
@@ -5,7 +5,7 @@
 import unittest
 from unittest.mock import patch, MagicMock, mock_open
 
-sys.path.insert(0, "../src")
+sys.path.insert(0, "../../src")
 
 from kaggle.api.kaggle_api_extended import KaggleApi
 

diff --git a/tests/test_quota.py → tests/unit/test_quota.py b/tests/test_quota.py → tests/unit/test_quota.py
@@ -5,7 +5,7 @@
 from datetime import datetime, timedelta, timezone
 from unittest.mock import MagicMock, patch
 
-sys.path.insert(0, "..")
+sys.path.insert(0, "../..")
 
 from kaggle.api.kaggle_api_extended import KaggleApi
 

diff --git a/tests/test_retry_after.py → tests/unit/test_retry_after.py b/tests/test_retry_after.py → tests/unit/test_retry_after.py
diff --git a/tests/test_team_submissions.py → tests/unit/test_team_submissions.py b/tests/test_team_submissions.py → tests/unit/test_team_submissions.py
@@ -4,7 +4,7 @@
 import unittest
 from unittest.mock import MagicMock, patch
 
-sys.path.insert(0, "..")
+sys.path.insert(0, "../..")
 
 from kaggle.api.kaggle_api_extended import KaggleApi