--- a/gdb/configure
+++ b/gdb/configure
@@ -918,8 +918,7 @@ MAKEINFOFLAGS
 YACC
 YFLAGS
 XMKMF'
-ac_subdirs_all='testsuite
-gdbtk
+ac_subdirs_all='gdbtk
 gdbserver'
 
 # Initialize some variables set by options.
@@ -6628,7 +6627,7 @@ $as_echo "$with_auto_load_safe_path" >&6
 
 
 
-subdirs="$subdirs testsuite"
+subdirs="$subdirs"
 
 
 # Check whether to support alternative target configurations