diff --git a/tests/integration/ulimit/__init__.py b/tests/integration/ulimit/__init__.py
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/tests/integration/ulimit/__init__.py
@@ -0,0 +1 @@
+
diff --git a/tests/integration/ulimit/test_podman_compose_ulimit.py b/tests/integration/ulimit/test_podman_compose_ulimit.py
new file mode 100644
index 0000000..283cd27
--- /dev/null
+++ b/tests/integration/ulimit/test_podman_compose_ulimit.py
@@ -0,0 +1,77 @@
+# SPDX-License-Identifier: GPL-2.0
+
+
+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 TestUlimit(unittest.TestCase, RunSubprocessMixin):
+    def test_ulimit(self):
+        compose_path = os.path.join(test_path(), "ulimit/docker-compose.yaml")
+        try:
+            self.run_subprocess_assert_returncode([
+                podman_compose_path(),
+                "-f",
+                compose_path,
+                "up",
+                "-d",
+            ])
+
+            out, _ = self.run_subprocess_assert_returncode([
+                "podman",
+                "logs",
+                "ulimit_ulimit1_1",
+            ])
+            split_output = out.strip(b"\n").split(b"\n")
+
+            # trow away system specific default ulimit values
+            output_part = [
+                el
+                for el in split_output
+                if not el.startswith(b"soft process") and not el.startswith(b"hard process")
+            ]
+            # BUG: figure out why echo is called twice
+            self.assertEqual(
+                output_part,
+                [
+                    b"soft nofile limit 1001",
+                    b"hard nofile limit 1001",
+                    b"soft nofile limit 1001",
+                    b"hard nofile limit 1001",
+                ],
+            )
+
+            out, _ = self.run_subprocess_assert_returncode([
+                "podman",
+                "logs",
+                "ulimit_ulimit2_1",
+            ])
+            self.assertEqual(
+                out,
+                b"soft process limit 1002\nhard process limit 2002\nsoft nofile limit 1002\n"
+                b"hard nofile limit 1002\nsoft process limit 1002\nhard process limit 2002\n"
+                b"soft nofile limit 1002\nhard nofile limit 1002\n",
+            )
+
+            out, _ = self.run_subprocess_assert_returncode([
+                "podman",
+                "logs",
+                "ulimit_ulimit3_1",
+            ])
+            self.assertEqual(
+                out,
+                b"soft process limit 1003\nhard process limit 2003\nsoft nofile limit 1003\n"
+                b"hard nofile limit 1003\nsoft process limit 1003\nhard process limit 2003\n"
+                b"soft nofile limit 1003\nhard nofile limit 1003\n",
+            )
+        finally:
+            self.run_subprocess_assert_returncode([
+                podman_compose_path(),
+                "-f",
+                compose_path,
+                "down",
+            ])
diff --git a/tests/integration/ulimit/ulimit.sh b/tests/integration/ulimit/ulimit.sh
index 1483d7b..4f7745a 100755
--- a/tests/integration/ulimit/ulimit.sh
+++ b/tests/integration/ulimit/ulimit.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-echo "soft process limit"
+echo -n "soft process limit "
 ulimit -S -u
-echo "hard process limit"
+echo -n "hard process limit "
 ulimit -H -u
-echo "soft nofile limit"
+echo -n "soft nofile limit "
 ulimit -S -n
-echo "hard nofile limit"
+echo -n "hard nofile limit "
 ulimit -H -n