diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6b333217..65b6e1a1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -168,6 +168,8 @@ jobs:
             os_version: "15.7"
           - toxenv: metadata
             os_version: "15.7"
+          - toxenv: python
+            os_version: "15.7"
           - toxenv: repository
             os_version: "15.7"
           - toxenv: all
diff --git a/bci_tester/data.py b/bci_tester/data.py
index 28fb016c..fab3b468 100755
--- a/bci_tester/data.py
+++ b/bci_tester/data.py
@@ -532,16 +532,22 @@ def create_BCI(
     build_tag="bci/python:3.12", available_versions=["15.6", "tumbleweed"]
 )
 
+PYTHON313_CONTAINER = create_BCI(
+    build_tag="bci/python:3.13", available_versions=["15.7"]
+)
+
 PYTHON_CONTAINERS = [
     PYTHON36_CONTAINER,
     PYTHON310_CONTAINER,
     PYTHON311_CONTAINER,
     PYTHON312_CONTAINER,
+    PYTHON313_CONTAINER,
 ]
 
 PYTHON_WITH_PIPX_CONTAINERS = [
     PYTHON310_CONTAINER,
-    PYTHON311_CONTAINER,
+    PYTHON312_CONTAINER,
+    PYTHON313_CONTAINER,
 ]
 
 RUBY_25_CONTAINER = create_BCI(
diff --git a/pyproject.toml b/pyproject.toml
index 2d3a3256..073f4bae 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -124,6 +124,7 @@ markers = [
     'python_3.10',
     'python_3.11',
     'python_3.12',
+    'python_3.13',
     'python_3.6',
     'registry_2.8',
     'ruby_2.5',
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index 41dd7a83..625896b6 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -78,10 +78,7 @@
 from bci_tester.data import POSTFIX_CONTAINERS
 from bci_tester.data import POSTGRESQL_CONTAINERS
 from bci_tester.data import PROMETHEUS_CONTAINERS
-from bci_tester.data import PYTHON36_CONTAINER
-from bci_tester.data import PYTHON310_CONTAINER
-from bci_tester.data import PYTHON311_CONTAINER
-from bci_tester.data import PYTHON312_CONTAINER
+from bci_tester.data import PYTHON_CONTAINERS
 from bci_tester.data import RUBY_25_CONTAINER
 from bci_tester.data import RUBY_33_CONTAINER
 from bci_tester.data import RUST_CONTAINERS
@@ -158,10 +155,6 @@ def _get_container_label_prefix(
         (NODEJS_18_CONTAINER, "nodejs", ImageType.LANGUAGE_STACK),
         (NODEJS_20_CONTAINER, "nodejs", ImageType.LANGUAGE_STACK),
         (NODEJS_22_CONTAINER, "nodejs", ImageType.LANGUAGE_STACK),
-        (PYTHON36_CONTAINER, "python", ImageType.LANGUAGE_STACK),
-        (PYTHON310_CONTAINER, "python", ImageType.LANGUAGE_STACK),
-        (PYTHON311_CONTAINER, "python", ImageType.LANGUAGE_STACK),
-        (PYTHON312_CONTAINER, "python", ImageType.LANGUAGE_STACK),
         (RUBY_25_CONTAINER, "ruby", ImageType.LANGUAGE_STACK),
         (RUBY_33_CONTAINER, "ruby", ImageType.LANGUAGE_STACK),
         (INIT_CONTAINER, "init", ImageType.OS),
@@ -170,6 +163,7 @@ def _get_container_label_prefix(
         (PHP_8_FPM, "php-fpm", ImageType.LANGUAGE_STACK),
         (NGINX_CONTAINER, "nginx", ImageType.APPLICATION),
     ]
+    + [(c, "python", ImageType.LANGUAGE_STACK) for c in PYTHON_CONTAINERS]
     + [(c, "base-fips", ImageType.OS) for c in BASE_FIPS_CONTAINERS]
     + [
         (container_pcp, "pcp", ImageType.APPLICATION)
diff --git a/tests/test_python.py b/tests/test_python.py
index 3fba1037..f2f479af 100644
--- a/tests/test_python.py
+++ b/tests/test_python.py
@@ -94,6 +94,10 @@ def test_python_version(auto_container):
     PYTHON_WITH_PIPX_CONTAINERS,
     indirect=["container_per_test"],
 )
+@pytest.mark.xfail(
+    OS_VERSION in ("15.7",),
+    reason="https://bugzilla.suse.com/show_bug.cgi?id=1232537",
+)
 def test_pipx(container_per_test):
     """Test that we can install xkcdpass via :command:`pipx`."""
     container_per_test.connection.check_output("pipx install xkcdpass")