diff --git a/python3.spec b/python3.spec
index 3126463..e33fb51 100644
--- a/python3.spec
+++ b/python3.spec
@@ -1051,12 +1051,18 @@ CheckPython() {
   # our non-standard decorators take effect on the relevant tests:
   #   @unittest._skipInRpmBuild(reason)
   #   @unittest._expectedFailureInRpmBuild
+  # test_gdb skipped on armv7hl:
+  #   https://bugzilla.redhat.com/show_bug.cgi?id=1196181
+  # test_gdb skipped on s390x:
+  #   https://bugzilla.redhat.com/show_bug.cgi?id=1678277
   WITHIN_PYTHON_RPM_BUILD= \
   LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \
     -wW --slowest -j0 \
     -x test_distutils \
     -x test_bdist_rpm \
+    %ifarch %{arm} s390x
     -x test_gdb \
+    %endif
     %ifarch %{mips64}
     -x test_ctypes \
     %endif
diff --git a/tests/tests.yml b/tests/tests.yml
index d26ece2..918d0b0 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -19,6 +19,7 @@
         run: VERSION=3.7 X="-x test_socket -x test_asyncgen -x test_asyncio -x test_compile -x test_concurrent_futures -x test_itertools -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_shutil -x test_time -x test_multiprocessing_spawn -x test_threading -x test_wsgiref" ./findleaks.sh
     required_packages:
     - gcc  # for extension building in venv and selftest
+    - gdb  # for test_gdb
     - python3-debug  # for leak testing
     - python3-devel  # for extension building in venv and selftest
     - python3-tkinter  # for selftest