diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3e0a5da2885..99cb9fe5e68 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-02-01  Markus Metzger  <markus.t.metzger@intel.com>
+
+	* gdb.btrace/enable.exp: Call gdb_exit before
+	skip_gdbserver_tests.
+
 2017-02-01  Markus Metzger  <markus.t.metzger@intel.com>
 
 	* gdb.btrace/non-stop.exp: Add '-ex "set non-stop on"' to
diff --git a/gdb/testsuite/gdb.btrace/enable.exp b/gdb/testsuite/gdb.btrace/enable.exp
index be20c08f064..61abe0ba4d2 100644
--- a/gdb/testsuite/gdb.btrace/enable.exp
+++ b/gdb/testsuite/gdb.btrace/enable.exp
@@ -74,6 +74,9 @@ gdb_test "record btrace" "The process is already being recorded\\.  Use \"record
 # continue to the end and make sure we don't die
 gdb_test "continue" ".*Inferior.*exited.*" "continue to end"
 
+# skip_gdbserver_tests requires GDB not running.
+gdb_exit
+
 # skip the rerun test when using gdbserver
 # otherwise rerun twice, target should be automatically disabled
 load_lib gdbserver-support.exp