--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitorenter01.java	Fri Aug 17 11:56:59 2018 -0500
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/threads/Monitorenter01.java	Fri Aug 17 13:20:53 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,15 +27,13 @@
 package org.graalvm.compiler.jtt.threads;
 
 import org.graalvm.compiler.jtt.JTTTest;
-import org.graalvm.compiler.jtt.hotspot.NotOnDebug;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
-import org.junit.rules.Timeout;
 
 public final class Monitorenter01 extends JTTTest {
 
-    @Rule public TestRule timeout = NotOnDebug.create(Timeout.seconds(20));
+    @Rule public TestRule timeout = createTimeoutSeconds(20);
 
     static final Object object = new Object();
 
@@ -50,7 +48,6 @@
 
     @Test
     public void run0() throws Throwable {
-        initializeForTimeout();
         runTest("test");
     }