diff --git a/tpm2.0-tools.changes b/tpm2.0-tools.changes
index 0767699..87058be 100644
--- a/tpm2.0-tools.changes
+++ b/tpm2.0-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan  4 12:56:09 UTC 2023 - Alberto Planas Dominguez <aplanas@suse.com>
+
+- Re-disable tests in PPC, PPC64 and S390X and reference issues about
+  endianness unsafe API
+
 -------------------------------------------------------------------
 Thu Dec  8 12:51:17 UTC 2022 - Alberto Planas Dominguez <aplanas@suse.com>
 
diff --git a/tpm2.0-tools.spec b/tpm2.0-tools.spec
index 62605dd..8b6c88b 100644
--- a/tpm2.0-tools.spec
+++ b/tpm2.0-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tpm2.0-tools
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,16 @@
 
 
 %define _lto_cflags %{nil}
+%ifarch %{ix86} x86_64 aarch64 %{arm} ppc64le
 %bcond_without  test
+%else
+# ppc ppc64 s390x: some code (tpm2_command_header_from_bytes) depend
+# on the endianness of the architecture:
+#   gh#tpm2-software/tpm2-tools#3055
+#   gh#tpm2-software/tpm2-tools#3060
+#   gh#tpm2-software/tpm2-tools#3061
+%bcond_with     test
+%endif
 Name:           tpm2.0-tools
 Version:        5.4
 Release:        0