diff --git a/tests/integration/uidmaps/docker-compose.yml b/tests/integration/uidmaps/docker-compose.yml
index ec5f0c74..deb84167 100644
--- a/tests/integration/uidmaps/docker-compose.yml
+++ b/tests/integration/uidmaps/docker-compose.yml
@@ -6,10 +6,9 @@ services:
     volumes:
       - ./:/mnt
     user: 999:999
-    x-podman:
-      uidmaps:
-        - "0:1:1"
-        - "999:0:1"
-      gidmaps:
-        - "0:1:1"
-        - "999:0:1"
\ No newline at end of file
+    x-podman.uidmaps:
+      - "0:1:1"
+      - "999:0:1"
+    x-podman.gidmaps:
+      - "0:1:1"
+      - "999:0:1"
diff --git a/tests/integration/uidmaps/test_podman_compose_uidmaps.py b/tests/integration/uidmaps/test_podman_compose_uidmaps.py
new file mode 100644
index 00000000..8a3b453f
--- /dev/null
+++ b/tests/integration/uidmaps/test_podman_compose_uidmaps.py
@@ -0,0 +1,40 @@
+# SPDX-License-Identifier: GPL-2.0
+
+import json
+import os
+import unittest
+
+from tests.integration.test_utils import RunSubprocessMixin
+from tests.integration.test_utils import podman_compose_path
+from tests.integration.test_utils import test_path
+
+
+class TestPodmanCompose(unittest.TestCase, RunSubprocessMixin):
+    def test_uidmaps(self):
+        compose_path = os.path.join(test_path(), "uidmaps", "docker-compose.yml")
+        try:
+            self.run_subprocess_assert_returncode([
+                podman_compose_path(),
+                "-f",
+                compose_path,
+                "up",
+                "-d",
+            ])
+
+            out, _ = self.run_subprocess_assert_returncode([
+                "podman",
+                "inspect",
+                "uidmaps_touch_1",
+            ])
+
+            inspect_out = json.loads(out)
+            host_config_map = inspect_out[0].get("HostConfig", {}).get("IDMappings", {})
+            self.assertEqual(['0:1:1', '999:0:1'], host_config_map['UidMap'])
+            self.assertEqual(['0:1:1', '999:0:1'], host_config_map['GidMap'])
+        finally:
+            out, _ = self.run_subprocess_assert_returncode([
+                podman_compose_path(),
+                "-f",
+                compose_path,
+                "down",
+            ])