diff --git a/bci_tester/data.py b/bci_tester/data.py
index 4ac50ffc..76256bb2 100755
--- a/bci_tester/data.py
+++ b/bci_tester/data.py
@@ -389,26 +389,37 @@ def create_BCI(
 
 # The very last container in this list needs to be available for all
 # tested OSes
-GOLANG_CONTAINERS = [
-    create_BCI(
-        build_tag=f"{BCI_CONTAINER_PREFIX}/golang:{golang_version}",
-        extra_marks=[pytest.mark.__getattr__(f"golang_{stability}")],
-        available_versions=_DEFAULT_NONBASE_SLE_VERSIONS,
-    )
-    for golang_version, stability in (
-        ("oldstable-openssl", "oldstable"),
-        ("stable-openssl", "stable"),
-    )
-] + [
-    create_BCI(
-        build_tag=f"{BCI_CONTAINER_PREFIX}/golang:{golang_version}",
-        extra_marks=[pytest.mark.__getattr__(f"golang_{stability}")],
-    )
-    for golang_version, stability in (
-        ("1.20", "oldstable"),
-        ("1.21", "stable"),
-    )
-]
+GOLANG_CONTAINERS = (
+    [
+        create_BCI(
+            build_tag=f"{BCI_CONTAINER_PREFIX}/golang:{golang_version}",
+            extra_marks=[pytest.mark.__getattr__(f"golang_{stability}")],
+            available_versions=_DEFAULT_NONBASE_SLE_VERSIONS,
+        )
+        for golang_version, stability in (
+            ("oldstable-openssl", "oldstable"),
+            ("stable-openssl", "stable"),
+        )
+    ]
+    + [
+        create_BCI(
+            build_tag=f"{BCI_CONTAINER_PREFIX}/golang:{golang_version}",
+            extra_marks=[pytest.mark.__getattr__(f"golang_{golang_version}")],
+            available_versions=["tumbleweed"],
+        )
+        for golang_version in ("unstable",)
+    ]
+    + [
+        create_BCI(
+            build_tag=f"{BCI_CONTAINER_PREFIX}/golang:{golang_version}",
+            extra_marks=[pytest.mark.__getattr__(f"golang_{stability}")],
+        )
+        for golang_version, stability in (
+            ("1.20", "oldstable"),
+            ("1.21", "stable"),
+        )
+    ]
+)
 
 OPENJDK_11_CONTAINER = create_BCI(build_tag="bci/openjdk:11")
 OPENJDK_DEVEL_11_CONTAINER = create_BCI(build_tag="bci/openjdk-devel:11")
diff --git a/pyproject.toml b/pyproject.toml
index fb301ea9..464607b5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -71,6 +71,7 @@ markers = [
     'golang_oldstable-openssl',
     'golang_stable',
     'golang_stable-openssl',
+    'golang_unstable',
     'mariadb_10.6',
     'mariadb_11.2',
     'mariadb-client_10.6',