diff --git a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.c b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.c
index 14b42405fc..a6ff0fd3d0 100644
--- a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.c
+++ b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.c
@@ -33,7 +33,7 @@ pthread_t threads[NTHREADS];
 
 pthread_barrier_t barrier;
 
-#define NFORKS 1000
+#define NFORKS 10
 
 /* Used to create a conditional breakpoint that always fails.  */
 volatile int zero;
@@ -108,7 +108,7 @@ main (void)
   pthread_t bp_thread;
 
   /* Don't run forever.  */
-  //  alarm (180);
+  alarm (180);
 
   pthread_barrier_init (&barrier, NULL, NTHREADS + 1);
 
diff --git a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
index b50e6ec7b2..448b734fd5 100644
--- a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
+++ b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
@@ -39,7 +39,6 @@ proc do_test { cond_bp_target detach_on_fork } {
 
     set saved_gdbflags $GDBFLAGS
     set GDBFLAGS [concat $GDBFLAGS " -ex \"set non-stop on\""]
-    set GDBFLAGS [concat $GDBFLAGS " -ex \"set sysroot /\""]
     clean_restart $binfile
     set GDBFLAGS $saved_gdbflags
 
@@ -72,7 +71,6 @@ proc do_test { cond_bp_target detach_on_fork } {
 	}
 	-re "Inferior $decimal \(\[^\r\n\]+\) exited normally" {
 	    incr fork_count
-	    exp_continue
 	    if {$fork_count <= 100} {
 		exp_continue
 	    } else {
@@ -107,7 +105,7 @@ proc foreach_with_prefix {var list body} {
 }
 
 foreach_with_prefix cond_bp_target {1 0} {
-    foreach_with_prefix detach_on_fork {"off" "off"} {
+    foreach_with_prefix detach_on_fork {"on" "off"} {
 	do_test $cond_bp_target $detach_on_fork
 
 	# Disable "off" for now.  The test does pass with