diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile
index 0b4af1164b..3bcc9d1238 100644
--- a/toolchain/gdb/Makefile
+++ b/toolchain/gdb/Makefile
@@ -36,6 +36,8 @@ HOST_CONFIGURE_ARGS = \
 	--enable-threads \
 	--with-expat \
 	--without-python \
+	--disable-unit-tests \
+	--disable-ubsan \
 	--disable-binutils \
 	--disable-ld \
 	--disable-gas \
diff --git a/toolchain/gdb/patches/110-no_testsuite.patch b/toolchain/gdb/patches/110-no_testsuite.patch
deleted file mode 100644
index 90a2574caf..0000000000
--- a/toolchain/gdb/patches/110-no_testsuite.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/gdb/configure
-+++ b/gdb/configure
-@@ -952,8 +952,7 @@ DEBUGINFOD_LIBS
- YACC
- YFLAGS
- XMKMF'
--ac_subdirs_all='testsuite
--gdbtk'
-+ac_subdirs_all='gdbtk'
- 
- # Initialize some variables set by options.
- ac_init_help=
-@@ -6668,7 +6667,7 @@ $as_echo "$with_auto_load_safe_path" >&6
- 
- 
- 
--subdirs="$subdirs testsuite"
-+subdirs="$subdirs"
- 
- 
- # Check whether to support alternative target configurations