diff --git a/podman/tests/integration/test_images.py b/podman/tests/integration/test_images.py
index 24f448c9..48bf38dc 100644
--- a/podman/tests/integration/test_images.py
+++ b/podman/tests/integration/test_images.py
@@ -236,6 +236,8 @@ def add_file(name: str, content: str):
         self.assertIsNotNone(image)
         self.assertIsNotNone(image.id)
 
+    # https://github.com/containers/podman-py/issues/636
+    @unittest.skipIf(platform.machine() != "x86_64", reason="test image only available on x86_64")
     def test_build_with_secret(self):
         with tempfile.TemporaryDirectory() as context_dir:
             dockerfile_path = os.path.join(context_dir, "Dockerfile")
diff --git a/podman/tests/integration/test_manifests.py b/podman/tests/integration/test_manifests.py
index 71235f0c..58e8e3c0 100644
--- a/podman/tests/integration/test_manifests.py
+++ b/podman/tests/integration/test_manifests.py
@@ -57,7 +57,10 @@ def test_manifest_crud(self):
 
         with self.subTest("Inspect"):
             actual = self.client.manifests.get("quay.io/libpod/alpine:latest")
-            self.assertEqual(actual.id, manifest.id)
+            # We don't check manifest.id since arm64 resolves a platform-specific
+            # digest rather than the top-level manifest list digest.
+            self.assertIsNotNone(actual.id)
+            self.assertTrue(actual.id)
 
             actual = self.client.manifests.get(manifest.name)
             self.assertEqual(actual.id, manifest.id)