diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ba5fae99e7d..465d606f0e5 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2018-10-12  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* gdb.trace/tspeed.exp: Remove nowarnings.
+	(prepare_for_trace_test): Declare "global ipalib".
+	* gdb.trace/tspeed.c: Include unistd.h.
+	(main): Remove superfluous printf argument.
+
 2018-10-11  Sandra Loosemore  <sandra@codesourcery.com>
 
 	* gdb.base/solib-vanish.exp: Fix regexp not to require a POSIX
diff --git a/gdb/testsuite/gdb.trace/tspeed.c b/gdb/testsuite/gdb.trace/tspeed.c
index b084d6a5bbc..8995ebb23ef 100644
--- a/gdb/testsuite/gdb.trace/tspeed.c
+++ b/gdb/testsuite/gdb.trace/tspeed.c
@@ -28,6 +28,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <sys/resource.h>
+#include <unistd.h>
 
 int trace_speed_test (void);
 
@@ -84,7 +85,7 @@ main(int argc, char **argv)
 	    }
 	  if (problem < 0)
 	    {
-	      printf ("Negative times, giving up\n", max_iters);
+	      printf ("Negative times, giving up\n");
 	      break;
 	    }
 
diff --git a/gdb/testsuite/gdb.trace/tspeed.exp b/gdb/testsuite/gdb.trace/tspeed.exp
index 47a82502a00..bc12afd0a83 100644
--- a/gdb/testsuite/gdb.trace/tspeed.exp
+++ b/gdb/testsuite/gdb.trace/tspeed.exp
@@ -21,7 +21,7 @@ set executable $testfile
 set ipalib [get_in_proc_agent]
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	  executable [concat {debug nowarnings c} shlib=$ipalib]] != "" } {
+	  executable [concat {debug c} shlib=$ipalib]] != "" } {
     untested "failed to compile"
     return -1
 }
@@ -38,6 +38,7 @@ set cr "\[\r\n\]+"
 
 proc prepare_for_trace_test {} {
     global executable
+    global ipalib
 
     clean_restart $executable
     gdb_load_shlib $ipalib