diff --git a/binary-compatibility-validator/reference-public-api/kotlinx-coroutines-debug.txt b/binary-compatibility-validator/reference-public-api/kotlinx-coroutines-debug.txt
index 183495af5c..604e6cd253 100644
--- a/binary-compatibility-validator/reference-public-api/kotlinx-coroutines-debug.txt
+++ b/binary-compatibility-validator/reference-public-api/kotlinx-coroutines-debug.txt
@@ -47,6 +47,8 @@ public final class kotlinx/coroutines/debug/junit4/CoroutinesTimeout : org/junit
 
 public final class kotlinx/coroutines/debug/junit4/CoroutinesTimeout$Companion {
 	public final fun seconds (IZ)Lkotlinx/coroutines/debug/junit4/CoroutinesTimeout;
+	public final fun seconds (JZ)Lkotlinx/coroutines/debug/junit4/CoroutinesTimeout;
 	public static synthetic fun seconds$default (Lkotlinx/coroutines/debug/junit4/CoroutinesTimeout$Companion;IZILjava/lang/Object;)Lkotlinx/coroutines/debug/junit4/CoroutinesTimeout;
+	public static synthetic fun seconds$default (Lkotlinx/coroutines/debug/junit4/CoroutinesTimeout$Companion;JZILjava/lang/Object;)Lkotlinx/coroutines/debug/junit4/CoroutinesTimeout;
 }
 
diff --git a/kotlinx-coroutines-debug/src/junit4/CoroutinesTimeout.kt b/kotlinx-coroutines-debug/src/junit4/CoroutinesTimeout.kt
index c69becb24c..ef81cd4b7e 100644
--- a/kotlinx-coroutines-debug/src/junit4/CoroutinesTimeout.kt
+++ b/kotlinx-coroutines-debug/src/junit4/CoroutinesTimeout.kt
@@ -49,7 +49,13 @@ public class CoroutinesTimeout(
          * Creates [CoroutinesTimeout] rule with the given timeout in seconds.
          */
         public fun seconds(seconds: Int, cancelOnTimeout: Boolean = false): CoroutinesTimeout =
-            CoroutinesTimeout(TimeUnit.SECONDS.toMillis(seconds.toLong()), cancelOnTimeout)
+            seconds(seconds.toLong(), cancelOnTimeout)
+
+        /**
+         * Creates [CoroutinesTimeout] rule with the given timeout in seconds.
+         */
+        public fun seconds(seconds: Long, cancelOnTimeout: Boolean = false): CoroutinesTimeout =
+            CoroutinesTimeout(TimeUnit.SECONDS.toMillis(seconds), cancelOnTimeout) // Overflow is properly handled by TimeUnit
     }
 
     /**
diff --git a/kotlinx-coroutines-debug/src/junit4/CoroutinesTimeoutStatement.kt b/kotlinx-coroutines-debug/src/junit4/CoroutinesTimeoutStatement.kt
index a00a17d58d..88864309b6 100644
--- a/kotlinx-coroutines-debug/src/junit4/CoroutinesTimeoutStatement.kt
+++ b/kotlinx-coroutines-debug/src/junit4/CoroutinesTimeoutStatement.kt
@@ -52,8 +52,7 @@ internal class CoroutinesTimeoutStatement(
                 "${testTimeoutMs / 1000} seconds"
             else "$testTimeoutMs milliseconds"
 
-        val message = "Test ${description.methodName} timed out after $units"
-        System.err.println("\n$message\n")
+        System.err.println("\nTest ${description.methodName} timed out after $units\n")
         System.err.flush()
 
         DebugProbes.dumpCoroutines()
@@ -65,7 +64,7 @@ internal class CoroutinesTimeoutStatement(
          * 2) Cancel all coroutines via debug agent API (changing system state!)
          * 3) Throw created exception
          */
-        val exception = createTimeoutException(message, testThread)
+        val exception = createTimeoutException(testThread)
         cancelIfNecessary()
         // If timed out test throws an exception, we can't do much except ignoring it
         throw exception
@@ -79,7 +78,7 @@ internal class CoroutinesTimeoutStatement(
         }
     }
 
-    private fun createTimeoutException(message: String, thread: Thread): Exception {
+    private fun createTimeoutException(thread: Thread): Exception {
         val stackTrace = thread.stackTrace
         val exception = TestTimedOutException(testTimeoutMs, TimeUnit.MILLISECONDS)
         exception.stackTrace = stackTrace
diff --git a/kotlinx-coroutines-debug/test/junit4/CoroutinesTimeoutTest.kt b/kotlinx-coroutines-debug/test/junit4/CoroutinesTimeoutTest.kt
index 8d50c723cc..fb170c071c 100644
--- a/kotlinx-coroutines-debug/test/junit4/CoroutinesTimeoutTest.kt
+++ b/kotlinx-coroutines-debug/test/junit4/CoroutinesTimeoutTest.kt
@@ -4,7 +4,6 @@
 
 package kotlinx.coroutines.debug.junit4
 
-import junit4.*
 import kotlinx.coroutines.*
 import org.junit.*
 import org.junit.runners.model.*
diff --git a/kotlinx-coroutines-debug/test/junit4/TestFailureValidation.kt b/kotlinx-coroutines-debug/test/junit4/TestFailureValidation.kt
index 9084926993..a10c51183e 100644
--- a/kotlinx-coroutines-debug/test/junit4/TestFailureValidation.kt
+++ b/kotlinx-coroutines-debug/test/junit4/TestFailureValidation.kt
@@ -2,10 +2,9 @@
  * Copyright 2016-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package junit4
+package kotlinx.coroutines.debug.junit4
 
 import kotlinx.coroutines.debug.*
-import kotlinx.coroutines.debug.junit4.*
 import org.junit.rules.*
 import org.junit.runner.*
 import org.junit.runners.model.*