diff --git a/xfails/Debian-x86_64-native-extended-gdbserver-m64/xfail b/xfails/Debian-x86_64-native-extended-gdbserver-m64/xfail
index 257302b..c8043e9 100644
--- a/xfails/Debian-x86_64-native-extended-gdbserver-m64/xfail
+++ b/xfails/Debian-x86_64-native-extended-gdbserver-m64/xfail
@@ -563,3 +563,4 @@ FAIL: gdb.reverse/sigall-reverse.exp: send signal XCPU (timeout)
 FAIL: gdb.reverse/sigall-reverse.exp: send signal XFSZ (timeout)
 FAIL: gdb.base/random-signal.exp: stop with control-c (timeout)
 FAIL: gdb.dwarf2/gdb-index.exp: touch binary
+FAIL: gdb.threads/next-bp-other-thread.exp: schedlock=off: next over function call
\ No newline at end of file
diff --git a/xfails/Fedora-i686/xfail b/xfails/Fedora-i686/xfail
index d39e8d0..de3086a 100644
--- a/xfails/Fedora-i686/xfail
+++ b/xfails/Fedora-i686/xfail
@@ -12,3 +12,55 @@ FAIL: gdb.ada/tagged.exp: print obj
 FAIL: gdb.ada/tagged.exp: ptype obj
 FAIL: gdb.ada/tagged_access.exp: ptype c.all
 FAIL: gdb.ada/tagged_access.exp: ptype c.menu_name
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 10: attach (got interactive prompt)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 10: break at break_fn: 1
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 10: break at break_fn: 2
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 10: break at break_fn: 3
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 10: break break_fn
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 1: detach
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 2: break at break_fn: 1
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 2: break at break_fn: 2
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 2: break at break_fn: 3
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 2: break break_fn
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 3: attach (got interactive prompt)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 3: break at break_fn: 1
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 3: break at break_fn: 2
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 3: break at break_fn: 3
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 3: break break_fn
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 3: detach (GDB internal error)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 4: attach (got interactive prompt)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 4: break at break_fn: 1
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 4: break at break_fn: 2
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 4: break at break_fn: 3
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 4: break break_fn
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 4: detach (GDB internal error)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 5: attach (got interactive prompt)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 5: break at break_fn: 1
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 5: break at break_fn: 2
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 5: break at break_fn: 3
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 5: break break_fn
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 5: detach (GDB internal error)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 6: attach (got interactive prompt)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 6: break at break_fn: 1
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 6: break at break_fn: 2
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 6: break at break_fn: 3
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 6: break break_fn
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 6: detach (GDB internal error)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 7: attach (got interactive prompt)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 7: break at break_fn: 1
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 7: break at break_fn: 2
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 7: break at break_fn: 3
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 7: break break_fn
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 7: detach (GDB internal error)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 8: attach (got interactive prompt)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 8: break at break_fn: 1
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 8: break at break_fn: 2
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 8: break at break_fn: 3
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 8: break break_fn
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 8: detach (GDB internal error)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 9: attach (got interactive prompt)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 9: break at break_fn: 1
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 9: break at break_fn: 2
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 9: break at break_fn: 3
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 9: break break_fn
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 9: detach (GDB internal error)
diff --git a/xfails/Fedora-x86_64-native-extended-gdbserver-m64/xfail b/xfails/Fedora-x86_64-native-extended-gdbserver-m64/xfail
index 5c21c57..4a1d845 100644
--- a/xfails/Fedora-x86_64-native-extended-gdbserver-m64/xfail
+++ b/xfails/Fedora-x86_64-native-extended-gdbserver-m64/xfail
@@ -15,5 +15,39 @@ FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 2: break at break_fn
 FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 2: break at break_fn: 2 (the program is no longer running)
 FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 2: break at break_fn: 3 (the program is no longer running)
 FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 2: detach (the program is no longer running)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 3: break at break_fn: 1 (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 3: break at break_fn: 2 (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 3: break at break_fn: 3 (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 3: break break_fn (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 3: detach (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 3: no new threads (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 3: set breakpoint always-inserted off (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 3: set breakpoint always-inserted on (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 4: break at break_fn: 1 (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 4: break at break_fn: 2 (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 4: break at break_fn: 3 (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 4: break break_fn (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 4: detach (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 4: no new threads (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 4: set breakpoint always-inserted off (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 4: set breakpoint always-inserted on (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 5: break at break_fn: 1 (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 5: break at break_fn: 2 (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 5: break at break_fn: 3 (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 5: break break_fn (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 5: detach (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 5: no new threads (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 5: set breakpoint always-inserted off (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 5: set breakpoint always-inserted on (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 6: break at break_fn: 1 (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 6: break at break_fn: 2 (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 6: break at break_fn: 3 (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 6: break break_fn (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 6: detach (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 6: no new threads (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 6: set breakpoint always-inserted off (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 6: set breakpoint always-inserted on (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 7: no new threads (timeout)
+FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 7: set breakpoint always-inserted on (got interactive prompt)
 FAIL: gdb.threads/next-bp-other-thread.exp: schedlock=off: next over function call
 FAIL: gdb.base/random-signal.exp: stop with control-c (timeout)