diff --git a/tests/test_init.py b/tests/test_init.py
index 52579d70..ea6ffc00 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -44,7 +44,7 @@ def test_systemd_no_udev_present(self, auto_container):
     def test_systemd_boottime(self, auto_container):
         """Ensure the container startup time is below 5 seconds"""
 
-        # FIXME: Temporary workaround: While using emulated workers, the startup time test doesn't make sense.'
+        # https://github.com/SUSE/BCI-tests/issues/647
         if auto_container.connection.system_info.arch == "ppc64le":
             pytest.skip(
                 "boottime test temporarily disabled on emulated ppc64le workers."
diff --git a/tests/test_mariadb.py b/tests/test_mariadb.py
index 559805e4..4932df5c 100644
--- a/tests/test_mariadb.py
+++ b/tests/test_mariadb.py
@@ -20,6 +20,7 @@
 from pytest_container.container import container_and_marks_from_pytest_param
 from pytest_container.pod import Pod
 from pytest_container.pod import PodData
+from pytest_container.runtime import LOCALHOST
 from pytest_container.runtime import OciRuntimeBase
 from tenacity import retry
 from tenacity import stop_after_attempt
@@ -93,7 +94,9 @@ def _generate_test_matrix() -> List[ParameterSet]:
 
 @retry(
     wait=wait_exponential(multiplier=1, min=4, max=10),
-    stop=stop_after_attempt(5),
+    stop=stop_after_attempt(
+        8 if LOCALHOST.system_info.arch == "ppc64le" else 5
+    ),
 )
 def _wait_for_server(connection):
     connection.check_output("healthcheck.sh --connect")
diff --git a/tests/test_postgres.py b/tests/test_postgres.py
index 36addeb2..d9de8391 100644
--- a/tests/test_postgres.py
+++ b/tests/test_postgres.py
@@ -1,5 +1,6 @@
 """Tests for the PostgreSQL related application container images."""
 
+from datetime import timedelta
 from itertools import product
 from typing import List
 from typing import Optional
@@ -10,6 +11,7 @@
 from pytest_container.container import ContainerData
 from pytest_container.container import DerivedContainer
 from pytest_container.container import container_and_marks_from_pytest_param
+from pytest_container.runtime import LOCALHOST
 
 from bci_tester.data import POSTGRESQL_CONTAINERS
 from bci_tester.data import POSTGRES_PASSWORD
@@ -66,6 +68,12 @@ def _generate_test_matrix() -> List[ParameterSet]:
                         extra_launch_args=(
                             ["--user", username] if username else []
                         ),
+                        # https://github.com/SUSE/BCI-tests/issues/647
+                        healthcheck_timeout=(
+                            timedelta(minutes=3)
+                            if LOCALHOST.system_info.arch == "ppc64le"
+                            else None
+                        ),
                     ),
                     pg_user,
                     pw,