--- old/test/hotspot/jtreg/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java	2020-05-20 18:04:22.611116108 -0700
+++ new/test/hotspot/jtreg/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java	2020-05-20 18:04:22.219108581 -0700
@@ -49,13 +49,6 @@
     public static final int ERROR_LOG_TIMEOUT = 16;
 
     public static void main(String[] args) throws Exception {
-
-        int error_log_timeout = ERROR_LOG_TIMEOUT;
-        if ("SunOS".equals(System.getProperty("os.name"))) {
-            // Give Solaris machines 3X as much time:
-            error_log_timeout *= 3;
-        }
-
         /* Start the VM and let it crash. Specify TestUnresponsiveErrorHandler which will
          * let five subsequent error reporting steps hang. The Timeout handling triggered
          * by the WatcherThread should kick in and interrupt those steps. In theory, the
@@ -82,7 +75,7 @@
             "-Xmx100M",
             "-XX:ErrorHandlerTest=14",
             "-XX:+TestUnresponsiveErrorHandler",
-            "-XX:ErrorLogTimeout=" + error_log_timeout,
+            "-XX:ErrorLogTimeout=" + ERROR_LOG_TIMEOUT,
             "-XX:-CreateCoredumpOnCrash",
             "-version");