--- a/test/hotspot/jtreg/runtime/handshake/HandshakeSuspendExitTest.java	Tue Mar 26 21:33:47 2019 +0800
+++ b/test/hotspot/jtreg/runtime/handshake/HandshakeSuspendExitTest.java	Tue Mar 26 14:49:54 2019 +0100
@@ -42,9 +42,9 @@
         while (!_exit_now) {
             // Leave last 2 threads running.
             for (int i = 0; i < _suspend_threads.length - 2; i++) {
-                if (Thread.currentThread() != thr) {
-                    thr.suspend();
-                    thr.resume();
+                if (Thread.currentThread() != _suspend_threads[i]) {
+                    _suspend_threads[i].suspend();
+                    _suspend_threads[i].resume();
                 }
             }
         }