Description: omitting Timeout annotation in the tests, as it is a feature of a
 not yet Debian-packaged version of junit5
Author: Pierre Gruet <pgt@debian.org>
Forwarded: not-needed
Last-Update: 2022-06-18

--- a/zookeeper-server/src/test/java/org/apache/zookeeper/ClientRequestTimeoutTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/ClientRequestTimeoutTest.java
@@ -38,7 +38,6 @@
 import org.apache.zookeeper.test.ClientBase;
 import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class ClientRequestTimeoutTest extends QuorumPeerTestBase {
 
@@ -50,7 +49,6 @@
     private ClientCnxn.Packet capturedPacket = null;
 
     @Test
-    @Timeout(value = 120)
     public void testClientRequestTimeout() throws Exception {
         int requestTimeOut = 15000;
         System.setProperty("zookeeper.request.timeout", Integer.toString(requestTimeOut));
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesCmdTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesCmdTest.java
@@ -32,7 +32,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,7 +67,6 @@
      * local=false
      */
     @Test
-    @Timeout(value = 30)
     public void testRemoveWatchesWithNoPassedOptions() throws Exception {
         List<EventType> expectedEvents = new ArrayList<>();
         expectedEvents.add(EventType.ChildWatchRemoved);
@@ -102,7 +100,6 @@
      * Test verifies deletion of NodeDataChanged watches
      */
     @Test
-    @Timeout(value = 30)
     public void testRemoveNodeDataChangedWatches() throws Exception {
         LOG.info("Adding data watcher using getData()");
         List<EventType> expectedEvents = new ArrayList<>();
@@ -128,7 +125,6 @@
      * Test verifies deletion of NodeCreated data watches
      */
     @Test
-    @Timeout(value = 30)
     public void testRemoveNodeCreatedWatches() throws Exception {
         List<EventType> expectedEvents = new ArrayList<>();
         expectedEvents.add(EventType.DataWatchRemoved);
@@ -160,7 +156,6 @@
      * Test verifies deletion of NodeChildrenChanged watches
      */
     @Test
-    @Timeout(value = 30)
     public void testRemoveNodeChildrenChangedWatches() throws Exception {
         List<EventType> expectedEvents = new ArrayList<>();
         expectedEvents.add(EventType.ChildWatchRemoved);
@@ -182,7 +177,6 @@
      * Test verifies deletion of NodeDeleted watches
      */
     @Test
-    @Timeout(value = 30)
     public void testRemoveNodeDeletedWatches() throws Exception {
         LOG.info("Adding NodeDeleted watcher");
         List<EventType> expectedEvents = new ArrayList<>();
@@ -214,7 +208,6 @@
      * Test verifies deletion of any watches
      */
     @Test
-    @Timeout(value = 30)
     public void testRemoveAnyWatches() throws Exception {
         verifyRemoveAnyWatches(false);
     }
@@ -224,7 +217,6 @@
      * connection
      */
     @Test
-    @Timeout(value = 30)
     public void testRemoveWatchesLocallyWhenNoServerConnection() throws Exception {
         verifyRemoveAnyWatches(true);
     }
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/RemoveWatchesTest.java
@@ -51,7 +51,6 @@
 import org.apache.zookeeper.test.ClientBase;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.slf4j.Logger;
@@ -176,7 +175,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveSingleWatcher(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL);
         zk1.create("/node2", null, Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL);
@@ -209,7 +207,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testMultipleDataWatchers(boolean useAsync) throws IOException, InterruptedException, KeeperException {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL);
         MyWatcher w1 = new MyWatcher("/node1", 1);
@@ -240,7 +237,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testMultipleChildWatchers(boolean useAsync) throws IOException, InterruptedException, KeeperException {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         MyWatcher w1 = new MyWatcher("/node1", 1);
@@ -276,7 +272,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveAllWatchers(boolean useAsync) throws IOException, InterruptedException, KeeperException {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         MyWatcher w1 = new MyWatcher("/node1", 2);
@@ -302,7 +297,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveAllDataWatchers(boolean useAsync) throws IOException, InterruptedException, KeeperException {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         MyWatcher w1 = new MyWatcher("/node1", 1);
@@ -345,7 +339,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveAllChildWatchers(boolean useAsync) throws IOException, InterruptedException, KeeperException {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         MyWatcher w1 = new MyWatcher("/node1", 1);
@@ -389,7 +382,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveAllPersistentWatchers(boolean useAsync) throws InterruptedException, KeeperException {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         BlockingDeque<WatchedEvent> persistentEvents1 = new LinkedBlockingDeque<>();
@@ -434,7 +426,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveAllPersistentRecursiveWatchers(boolean useAsync) throws InterruptedException, KeeperException {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         BlockingDeque<WatchedEvent> recursiveEvents1 = new LinkedBlockingDeque<>();
@@ -477,7 +468,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testNoWatcherException(boolean useAsync) throws IOException, InterruptedException, KeeperException {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         MyWatcher w1 = new MyWatcher("/node1", 2);
@@ -506,7 +496,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveAnyDataWatcher(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         MyWatcher w1 = new MyWatcher("/node1", 1);
@@ -533,7 +522,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveAnyChildWatcher(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         MyWatcher w1 = new MyWatcher("/node1", 2);
@@ -559,7 +547,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveWatcherWhenNoConnection(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         MyWatcher w1 = new MyWatcher("/node1", 2);
@@ -590,7 +577,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testManyPreNodeWatchers(boolean useAsync) throws Exception {
         int count = 50;
         List<MyWatcher> wList = new ArrayList<>(count);
@@ -619,7 +605,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testManyChildWatchers(boolean useAsync) throws Exception {
         int count = 50;
         List<MyWatcher> wList = new ArrayList<>(count);
@@ -655,7 +640,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testManyDataWatchers(boolean useAsync) throws Exception {
         int count = 50;
         List<MyWatcher> wList = new ArrayList<>(count);
@@ -687,7 +671,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testManyWatchersWhenNoConnection(boolean useAsync) throws Exception {
         int count = 3;
         List<MyWatcher> wList = new ArrayList<>(count);
@@ -734,7 +717,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testChRootRemoveWatcher(boolean useAsync) throws Exception {
         // creating the subtree for chRoot clients.
         String chRoot = "/appsX";
@@ -790,7 +772,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testNoWatcherServerException(boolean useAsync) throws KeeperException, InterruptedException, IOException, TimeoutException {
         CountdownWatcher watcher = new CountdownWatcher();
         ZooKeeper zk = spy(new ZooKeeper(hostPort, CONNECTION_TIMEOUT, watcher));
@@ -809,7 +790,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveAllNoWatcherException(boolean useAsync) throws IOException, InterruptedException, KeeperException {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         removeAllWatches(zk2, "/node1", WatcherType.Any, false, Code.NOWATCHER, useAsync);
@@ -820,7 +800,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 30)
     public void testNullWatcherReference(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         try {
@@ -841,7 +820,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveWhenMultipleDataWatchesOnAPath(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         final CountDownLatch dataWatchCount = new CountDownLatch(1);
@@ -876,7 +854,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveWhenMultipleChildWatchesOnAPath(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         final CountDownLatch childWatchCount = new CountDownLatch(1);
@@ -910,7 +887,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveWhenMultiplePersistentWatchesOnAPath(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
@@ -934,7 +910,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveWhenMultiplePersistentRecursiveWatchesOnAPath(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
@@ -958,7 +933,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemovePersistentWatchesOnAPathPartially(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
@@ -988,7 +962,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveAllDataWatchesOnAPath(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
@@ -1033,7 +1006,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveAllChildWatchesOnAPath(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
@@ -1076,7 +1048,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveAllPersistentWatchesOnAPath(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
@@ -1116,7 +1087,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveAllPersistentWatchesOnAPathPartially(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
@@ -1145,7 +1115,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveAllPersistentRecursiveWatchesOnAPath(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
@@ -1187,7 +1156,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testRemoveAllWatchesOnAPath(boolean useAsync) throws Exception {
         zk1.create("/node1", null, Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/client/ZKClientConfigTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/client/ZKClientConfigTest.java
@@ -40,7 +40,6 @@
 import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class ZKClientConfigTest {
 
@@ -54,7 +53,6 @@
     }
 
     @Test
-    @Timeout(value = 10)
     public void testDefaultConfiguration() {
         Map<String, String> properties = new HashMap<>();
         properties.put(ZK_SASL_CLIENT_USERNAME, "zookeeper1");
@@ -93,7 +91,6 @@
     }
 
     @Test
-    @Timeout(value = 10)
     public void testSystemPropertyValue() {
         String clientName = "zookeeper1";
         System.setProperty(ZK_SASL_CLIENT_USERNAME, clientName);
@@ -108,7 +105,6 @@
     }
 
     @Test
-    @Timeout(value = 10)
     public void testReadConfigurationFile() throws IOException, ConfigException {
         File file = File.createTempFile("clientConfig", ".conf", testData);
         file.deleteOnExit();
@@ -139,7 +135,6 @@
     }
 
     @Test
-    @Timeout(value = 10)
     public void testSetConfiguration() {
         ZKClientConfig conf = new ZKClientConfig();
         String defaultValue = conf.getProperty(ZKClientConfig.ENABLE_CLIENT_SASL_KEY, ZKClientConfig.ENABLE_CLIENT_SASL_DEFAULT);
@@ -152,7 +147,6 @@
     }
 
     @Test
-    @Timeout(value = 10)
     public void testIntegerRetrievalFromProperty() {
         ZKClientConfig conf = new ZKClientConfig();
         String prop = "UnSetProperty" + System.currentTimeMillis();
@@ -186,7 +180,6 @@
     }
 
     @Test
-    @Timeout(value = 10)
     public void testIntegerRetrievalFromHexadecimalProperty() {
         int hexaValue = 0x3000000;
         String wrongValue = "0xwel";
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509UtilTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509UtilTest.java
@@ -57,7 +57,6 @@
 import org.apache.zookeeper.client.ZKClientConfig;
 import org.apache.zookeeper.server.ServerCnxnFactory;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -101,7 +100,6 @@
 
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testCreateSSLContextWithoutCustomProtocol(
             X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
             throws Exception {
@@ -126,7 +124,6 @@
 
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testCreateSSLContextWithCustomProtocol(
             X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
             throws Exception {
@@ -139,7 +136,6 @@
 
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testCreateSSLContextWithoutKeyStoreLocation(
             X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
             throws Exception {
@@ -150,7 +146,6 @@
 
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testCreateSSLContextWithoutKeyStorePassword(
             X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
             throws Exception {
@@ -166,7 +161,6 @@
 
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testCreateSSLContext_withKeyStorePasswordFromFile(final X509KeyType caKeyType,
                                                                  final X509KeyType certKeyType,
                                                                  final String keyPassword,
@@ -181,7 +175,6 @@
 
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testCreateSSLContext_withTrustStorePasswordFromFile(final X509KeyType caKeyType,
                                                                    final X509KeyType certKeyType,
                                                                    final String keyPassword,
@@ -195,7 +188,6 @@
 
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testCreateSSLContext_withWrongKeyStorePasswordFromFile(final X509KeyType caKeyType,
                                                                       final X509KeyType certKeyType,
                                                                       final String keyPassword,
@@ -206,7 +198,6 @@
 
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testCreateSSLContext_withWrongTrustStorePasswordFromFile(final X509KeyType caKeyType,
                                                                          final X509KeyType certKeyType,
                                                                          final String keyPassword,
@@ -217,7 +208,6 @@
 
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testCreateSSLContextWithCustomCipherSuites(
             X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
             throws Exception {
@@ -231,7 +221,6 @@
     // possible
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testCRLEnabled(
             X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
             throws Exception {
@@ -245,7 +234,6 @@
 
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testCRLDisabled(
             X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
             throws Exception {
@@ -258,7 +246,6 @@
 
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testOCSPEnabled(
             X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
             throws Exception {
@@ -272,7 +259,6 @@
 
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testCreateSSLSocket(
             X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
             throws Exception {
@@ -284,7 +270,6 @@
 
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testCreateSSLServerSocketWithoutPort(
             X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
             throws Exception {
@@ -297,7 +282,6 @@
 
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 5)
     public void testCreateSSLServerSocketWithPort(
             X509KeyType caKeyType, X509KeyType certKeyType, String keyPassword, Integer paramIndex)
             throws Exception {
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java
@@ -21,7 +21,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class ZKConfigTest {
 
@@ -34,7 +33,6 @@
 
     // property is not set we should get the default value
     @Test
-    @Timeout(value = 10)
     public void testBooleanRetrievalFromPropertyDefault() {
         ZKConfig conf = new ZKConfig();
         String prop = "UnSetProperty" + System.currentTimeMillis();
@@ -45,7 +43,6 @@
 
     // property is set to an valid boolean, we should get the set value
     @Test
-    @Timeout(value = 10)
     public void testBooleanRetrievalFromProperty() {
         boolean value = true;
         boolean defaultValue = false;
@@ -57,7 +54,6 @@
 
     // property is set but with white spaces in the beginning
     @Test
-    @Timeout(value = 10)
     public void testBooleanRetrievalFromPropertyWithWhitespacesInBeginning() {
         boolean value = true;
         boolean defaultValue = false;
@@ -69,7 +65,6 @@
 
     // property is set but with white spaces at the end
     @Test
-    @Timeout(value = 10)
     public void testBooleanRetrievalFromPropertyWithWhitespacesAtEnd() {
         boolean value = true;
         boolean defaultValue = false;
@@ -81,7 +76,6 @@
 
     // property is set but with white spaces at the beginning and the end
     @Test
-    @Timeout(value = 10)
     public void testBooleanRetrievalFromPropertyWithWhitespacesAtBeginningAndEnd() {
         boolean value = true;
         boolean defaultValue = false;
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateContainerTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/CreateContainerTest.java
@@ -48,7 +48,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class CreateContainerTest extends ClientBase {
 
@@ -82,14 +81,12 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testCreate() throws KeeperException, InterruptedException {
         createNoStatVerifyResult("/foo");
         createNoStatVerifyResult("/foo/child");
     }
 
     @Test
-    @Timeout(value = 30)
     public void testCreateWithStat() throws KeeperException, InterruptedException {
         Stat stat = createWithStatVerifyResult("/foo");
         Stat childStat = createWithStatVerifyResult("/foo/child");
@@ -99,7 +96,6 @@
 
     @SuppressWarnings("ConstantConditions")
     @Test
-    @Timeout(value = 30)
     public void testCreateWithNullStat() throws KeeperException, InterruptedException {
         final String name = "/foo";
         assertNull(zk.exists(name, false));
@@ -113,7 +109,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testSimpleDeletion() throws KeeperException, InterruptedException {
         zk.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
         zk.create("/foo/bar", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
@@ -127,7 +122,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testMultiWithContainerSimple() throws KeeperException, InterruptedException {
         Op createContainer = Op.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
         zk.multi(Collections.singletonList(createContainer));
@@ -137,7 +131,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testMultiWithContainer() throws KeeperException, InterruptedException {
         Op createContainer = Op.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
         Op createChild = Op.create("/foo/bar", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
@@ -166,7 +159,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testSimpleDeletionAsync() throws KeeperException, InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
         AsyncCallback.Create2Callback cb = (rc, path, ctx, name, stat) -> {
@@ -186,7 +178,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testCascadingDeletion() throws KeeperException, InterruptedException {
         zk.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
         zk.create("/foo/bar", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
@@ -204,7 +195,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testFalseEmpty() throws KeeperException, InterruptedException {
         zk.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
         zk.create("/foo/bar", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
@@ -221,7 +211,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testMaxPerMinute() throws InterruptedException {
         final BlockingQueue<String> queue = new LinkedBlockingQueue<>();
         RequestProcessor processor = new RequestProcessor() {
@@ -263,7 +252,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testMaxNeverUsedInterval() throws KeeperException, InterruptedException {
         zk.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
         AtomicLong elapsed = new AtomicLong(0);
@@ -291,7 +279,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testZeroMaxNeverUsedInterval() throws KeeperException, InterruptedException {
         zk.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.CONTAINER);
         AtomicInteger deletesQty = new AtomicInteger(0);
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/DataTreeTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/DataTreeTest.java
@@ -53,7 +53,6 @@
 import org.apache.zookeeper.txn.CreateTxn;
 import org.apache.zookeeper.txn.TxnHeader;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -66,7 +65,6 @@
      * removing the session related ephemerals from DataTree structure
      */
     @Test
-    @Timeout(value = 60)
     public void testDumpEphemerals() throws Exception {
         int count = 1000;
         long session = 1000;
@@ -111,7 +109,6 @@
     }
 
     @Test
-    @Timeout(value = 60)
     public void testRootWatchTriggered() throws Exception {
         DataTree dt = new DataTree();
 
@@ -133,7 +130,6 @@
      * For ZOOKEEPER-1046 test if cversion is getting incremented correctly.
      */
     @Test
-    @Timeout(value = 60)
     public void testIncrementCversion() throws Exception {
         try {
             // digestCalculator gets initialized for the new DataTree constructor based on the system property
@@ -227,7 +223,6 @@
     }
 
     @Test
-    @Timeout(value = 60)
     public void testPathTrieClearOnDeserialize() throws Exception {
 
         //Create a DataTree with quota nodes so PathTrie get updated
@@ -266,7 +261,6 @@
      * This test verifies the fix that we should not hold ACL cache during dumping aclcache to snapshots
     */
     @Test
-    @Timeout(value = 60)
     public void testSerializeDoesntLockACLCacheWhileWriting() throws Exception {
         DataTree tree = new DataTree();
         tree.createNode("/marker", new byte[] { 42 }, null, -1, 1, 1, 1);
@@ -311,7 +305,6 @@
     /* ZOOKEEPER-3531 - similarly for aclCache.deserialize, we should not hold lock either
     */
     @Test
-    @Timeout(value = 60)
     public void testDeserializeDoesntLockACLCacheWhileReading() throws Exception {
         DataTree tree = new DataTree();
         tree.createNode("/marker", new byte[] { 42 }, null, -1, 1, 1, 1);
@@ -369,7 +362,6 @@
      * the DataNode lock while calling OutputArchive.writeRecord.
      */
     @Test
-    @Timeout(value = 60)
     public void testSerializeDoesntLockDataNodeWhileWriting() throws Exception {
         DataTree tree = new DataTree();
         tree.createNode("/marker", new byte[] { 42 }, null, -1, 1, 1, 1);
@@ -418,7 +410,6 @@
     }
 
     @Test
-    @Timeout(value = 60)
     public void testReconfigACLClearOnDeserialize() throws Exception {
         DataTree tree = new DataTree();
         // simulate the upgrading scenario, where the reconfig znode
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/NIOServerCnxnTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/NIOServerCnxnTest.java
@@ -32,7 +32,6 @@
 import org.apache.zookeeper.server.quorum.BufferStats;
 import org.apache.zookeeper.test.ClientBase;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,7 +43,6 @@
      * Test operations on ServerCnxn after socket closure.
      */
     @Test
-    @Timeout(value = 60)
     public void testOperationsAfterCnxnClose() throws IOException, InterruptedException, KeeperException {
         final ZooKeeper zk = createClient();
 
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/NettyServerCnxnTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/NettyServerCnxnTest.java
@@ -66,7 +66,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -106,7 +105,6 @@
      * @see <a href="https://issues.jboss.org/browse/NETTY-412">NETTY-412</a>
      */
     @Test
-    @Timeout(value = 40)
     public void testSendCloseSession() throws Exception {
         assertTrue(serverFactory instanceof NettyServerCnxnFactory, "Didn't instantiate ServerCnxnFactory with NettyServerCnxnFactory!");
 
@@ -146,7 +144,6 @@
      * connection fails.
      */
     @Test
-    @Timeout(value = 40)
     public void testMaxConnectionPerIpSurpased() {
         assertTrue(serverFactory instanceof NettyServerCnxnFactory, "Did not instantiate ServerCnxnFactory with NettyServerCnxnFactory!");
         assertThrows(ProtocolException.class, () -> {
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/SessionTrackerTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/SessionTrackerTest.java
@@ -34,7 +34,6 @@
 import org.apache.zookeeper.server.SessionTrackerImpl.SessionImpl;
 import org.apache.zookeeper.test.ClientBase;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 /**
  * Testing zk client session logic in sessiontracker
@@ -51,7 +50,6 @@
      * the session expiration.
      */
     @Test
-    @Timeout(value = 20)
     public void testAddSessionAfterSessionExpiry() throws Exception {
         RequestThrottler.setMaxRequests(0);
         ZooKeeperServer zks = setupSessionTracker();
@@ -89,7 +87,6 @@
      * after session expiration by the session tracker
      */
     @Test
-    @Timeout(value = 20)
     public void testCloseSessionRequestAfterSessionExpiry() throws Exception {
         ZooKeeperServer zks = setupSessionTracker();
 
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMainTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMainTest.java
@@ -49,7 +49,6 @@
 import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
 import org.apache.zookeeper.test.ClientBase;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -178,7 +177,6 @@
      * writing transaction log), ZooKeeper is still available.
      */
     @Test
-    @Timeout(value = 30)
     public void testNonRecoverableError() throws Exception {
         ClientBase.setupTestEnv();
 
@@ -229,7 +227,6 @@
      * This test will fail if it is executed as root user.
      */
     @Test
-    @Timeout(value = 30)
     public void testReadOnlySnapshotDir() throws Exception {
         ClientBase.setupTestEnv();
         final int CLIENT_PORT = PortAssignment.unique();
@@ -268,7 +265,6 @@
      * This test will fail if it is executed as root user.
      */
     @Test
-    @Timeout(value = 30)
     public void testReadOnlyTxnLogDir() throws Exception {
         ClientBase.setupTestEnv();
         final int CLIENT_PORT = PortAssignment.unique();
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMaxCnxnsTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMaxCnxnsTest.java
@@ -33,7 +33,6 @@
 import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,14 +51,12 @@
      */
 
     @Test
-    @Timeout(value = 120)
     public void testMaxZooKeeperClientsWithNIOServerCnxnFactory() throws Exception {
         String serverCnxnFactory = "org.apache.zookeeper.server.NIOServerCnxnFactory";
         testMaxZooKeeperClients(serverCnxnFactory);
     }
 
     @Test
-    @Timeout(value = 120)
     public void testMaxZooKeeperClientsWithNettyServerCnxnFactory() throws Exception {
         String serverCnxnFactory = "org.apache.zookeeper.server.NettyServerCnxnFactory";
         testMaxZooKeeperClients(serverCnxnFactory);
@@ -177,4 +174,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerStartupTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerStartupTest.java
@@ -35,7 +35,6 @@
 import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -77,7 +76,6 @@
      * https://issues.apache.org/jira/browse/ZOOKEEPER-2383
      */
     @Test
-    @Timeout(value = 30)
     public void testClientConnectionRequestDuringStartupWithNIOServerCnxn() throws Exception {
         tmpDir = ClientBase.createTmpDir();
         ClientBase.setupTestEnv();
@@ -108,7 +106,6 @@
      * https://issues.apache.org/jira/browse/ZOOKEEPER-2383
      */
     @Test
-    @Timeout(value = 30)
     public void testClientConnectionRequestDuringStartupWithNettyServerCnxn() throws Exception {
         tmpDir = ClientBase.createTmpDir();
         ClientBase.setupTestEnv();
@@ -148,7 +145,6 @@
      * https://issues.apache.org/jira/browse/ZOOKEEPER-2383
      */
     @Test
-    @Timeout(value = 30)
     public void testFourLetterWords() throws Exception {
         startSimpleZKServer(startupDelayLatch);
         verify("conf", ZK_NOT_SERVING);
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperThreadTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperThreadTest.java
@@ -23,7 +23,6 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.zookeeper.ZKTestCase;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class ZooKeeperThreadTest extends ZKTestCase {
 
@@ -73,7 +72,6 @@
      * Test verifies uncaught exception handling of ZooKeeperThread
      */
     @Test
-    @Timeout(value = 30)
     public void testUncaughtException() throws Exception {
         MyThread t1 = new MyThread("Test-Thread");
         t1.start();
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorConcurrencyTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CommitProcessorConcurrencyTest.java
@@ -49,7 +49,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -419,7 +418,6 @@
      * processed.
      */
     @Test
-    @Timeout(value = 1)
     public void noStarvationOfNonLocalCommittedRequestsTest() throws Exception {
         final String path = "/noStarvationOfCommittedRequests";
         processor.queuedRequests = new MockRequestsQueue();
@@ -522,7 +520,6 @@
      * session queue but it sees a commit for a request that belongs to the previous connection.
      */
     @Test
-    @Timeout(value = 5)
     public void noCrashOnCommittedRequestsOfUnseenRequestTest() throws Exception {
         final String path = "/noCrash/OnCommittedRequests/OfUnseenRequestTest";
         final int numberofReads = 10;
@@ -584,7 +581,6 @@
      * We should commit the requests according to the order we receive from the leader, i.e., wait for the relevant commit.
      */
     @Test
-    @Timeout(value = 5)
     public void noCrashOnOutofOrderCommittedRequestTest() throws Exception {
         final String path = "/noCrash/OnCommittedRequests/OfUnSeenRequestTest";
         final int sessionid = 0x123456;
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/DIFFSyncConsistencyTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/DIFFSyncConsistencyTest.java
@@ -41,7 +41,6 @@
 import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class DIFFSyncConsistencyTest extends QuorumPeerTestBase {
 
@@ -49,7 +48,6 @@
     private MainThread[] mt = new MainThread[SERVER_COUNT];
 
     @Test
-    @Timeout(value = 120)
     public void testInconsistentDueToUncommittedLog() throws Exception {
         final int LEADER_TIMEOUT_MS = 10_000;
         final int[] clientPorts = new int[SERVER_COUNT];
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EphemeralNodeDeletionTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EphemeralNodeDeletionTest.java
@@ -40,7 +40,6 @@
 import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class EphemeralNodeDeletionTest extends QuorumPeerTestBase {
 
@@ -54,7 +53,6 @@
      */
 
     @Test
-    @Timeout(value = 120)
     public void testEphemeralNodeDeletion() throws Exception {
         final int[] clientPorts = new int[SERVER_COUNT];
         StringBuilder sb = new StringBuilder();
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EpochWriteFailureTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EpochWriteFailureTest.java
@@ -32,7 +32,6 @@
 import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class EpochWriteFailureTest extends QuorumPeerTestBase {
     private static int SERVER_COUNT = 3;
@@ -47,7 +46,6 @@
      * run time values of acceptedEpoch,
      */
     @Test
-    @Timeout(value = 120)
     public void testAcceptedEpochWriteFailure() throws Exception {
         StringBuilder sb = new StringBuilder();
         sb.append("admin.enableServer=false");
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java
@@ -118,7 +118,6 @@
 import org.bouncycastle.util.io.pem.PemWriter;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -494,7 +493,6 @@
     }
 
     @TestBothFipsModes
-    @Timeout(value = 5, unit = TimeUnit.MINUTES)
     public void testQuorumSSL(boolean fipsEnabled) throws Exception {
         System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
 
@@ -517,7 +515,6 @@
     }
 
     @TestBothFipsModes
-    @Timeout(value = 5, unit = TimeUnit.MINUTES)
     public void testQuorumSSL_withPasswordFromFile(boolean fipsEnabled) throws Exception {
         System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
 
@@ -543,7 +540,6 @@
     }
 
     @TestBothFipsModes
-    @Timeout(value = 5, unit = TimeUnit.MINUTES)
     public void testQuorumSSLWithMultipleAddresses(boolean fipsEnabled) throws Exception {
         System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
 
@@ -570,7 +566,6 @@
 
 
     @TestBothFipsModes
-    @Timeout(value = 5, unit = TimeUnit.MINUTES)
     public void testRollingUpgrade(boolean fipsEnabled) throws Exception {
         System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
 
@@ -620,7 +615,6 @@
     }
 
     @TestNoFipsOnly
-    @Timeout(value = 5, unit = TimeUnit.MINUTES)
     public void testHostnameVerificationWithInvalidHostname(boolean fipsEnabled) throws Exception {
         System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
         String badhostnameKeystorePath = tmpDir + "/badhost.jks";
@@ -638,7 +632,6 @@
     }
 
     @TestNoFipsOnly
-    @Timeout(value = 5, unit = TimeUnit.MINUTES)
     public void testHostnameVerificationWithInvalidIPAddress(boolean fipsEnabled) throws Exception {
         System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
         String badhostnameKeystorePath = tmpDir + "/badhost.jks";
@@ -656,7 +649,6 @@
     }
 
     @TestNoFipsOnly
-    @Timeout(value = 5, unit = TimeUnit.MINUTES)
     public void testHostnameVerificationWithInvalidIpAddressAndInvalidHostname(boolean fipsEnabled) throws Exception {
         System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
 
@@ -675,7 +667,6 @@
     }
 
     @TestNoFipsOnly
-    @Timeout(value = 5, unit = TimeUnit.MINUTES)
     public void testHostnameVerificationForInvalidMultiAddressServerConfig(boolean fipsEnabled) throws Exception {
         System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
 
@@ -697,7 +688,6 @@
     }
 
     @TestNoFipsOnly
-    @Timeout(value = 5, unit = TimeUnit.MINUTES)
     public void testHostnameVerificationWithInvalidIpAddressAndValidHostname(boolean fipsEnabled) throws Exception {
         System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
 
@@ -716,7 +706,6 @@
     }
 
     @TestNoFipsOnly
-    @Timeout(value = 5, unit = TimeUnit.MINUTES)
     public void testHostnameVerificationWithValidIpAddressAndInvalidHostname(boolean fipsEnabled) throws Exception {
         System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
 
@@ -785,75 +774,6 @@
     }
 
     @TestBothFipsModes
-    @Timeout(value = 5, unit = TimeUnit.MINUTES)
-    public void testCertificateRevocationList(boolean fipsEnabled) throws Exception {
-        System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
-
-        q1 = new MainThread(1, clientPortQp1, quorumConfiguration, SSL_QUORUM_ENABLED);
-        q2 = new MainThread(2, clientPortQp2, quorumConfiguration, SSL_QUORUM_ENABLED);
-
-        q1.start();
-        q2.start();
-
-        assertTrue(ClientBase.waitForServerUp("127.0.0.1:" + clientPortQp1, CONNECTION_TIMEOUT));
-        assertTrue(ClientBase.waitForServerUp("127.0.0.1:" + clientPortQp2, CONNECTION_TIMEOUT));
-
-        String revokedInCRLKeystorePath = tmpDir + "/crl_revoked.jks";
-        String crlPath = tmpDir + "/crl.pem";
-        X509Certificate revokedInCRLCert = buildEndEntityCert(
-            defaultKeyPair,
-            rootCertificate,
-            rootKeyPair.getPrivate(),
-            HOSTNAME,
-            null,
-            crlPath,
-            null);
-        writeKeystore(revokedInCRLCert, defaultKeyPair, revokedInCRLKeystorePath);
-        buildCRL(revokedInCRLCert, crlPath);
-
-        System.setProperty(quorumX509Util.getSslKeystoreLocationProperty(), revokedInCRLKeystorePath);
-
-        // This server should join successfully
-        q3 = new MainThread(3, clientPortQp3, quorumConfiguration, SSL_QUORUM_ENABLED);
-        q3.start();
-
-        assertTrue(ClientBase.waitForServerUp("127.0.0.1:" + clientPortQp3, CONNECTION_TIMEOUT));
-
-        q1.shutdown();
-        q2.shutdown();
-        q3.shutdown();
-
-        assertTrue(ClientBase.waitForServerDown("127.0.0.1:" + clientPortQp1, CONNECTION_TIMEOUT));
-        assertTrue(ClientBase.waitForServerDown("127.0.0.1:" + clientPortQp2, CONNECTION_TIMEOUT));
-        assertTrue(ClientBase.waitForServerDown("127.0.0.1:" + clientPortQp3, CONNECTION_TIMEOUT));
-
-        setSSLSystemProperties();
-        System.setProperty(quorumX509Util.getSslCrlEnabledProperty(), "true");
-
-        X509Certificate validCertificate = buildEndEntityCert(
-            defaultKeyPair,
-            rootCertificate,
-            rootKeyPair.getPrivate(),
-            HOSTNAME,
-            null,
-            crlPath,
-            null);
-        writeKeystore(validCertificate, defaultKeyPair, validKeystorePath);
-
-        q1.start();
-        q2.start();
-
-        assertTrue(ClientBase.waitForServerUp("127.0.0.1:" + clientPortQp1, CONNECTION_TIMEOUT));
-        assertTrue(ClientBase.waitForServerUp("127.0.0.1:" + clientPortQp2, CONNECTION_TIMEOUT));
-
-        System.setProperty(quorumX509Util.getSslKeystoreLocationProperty(), revokedInCRLKeystorePath);
-        q3.start();
-
-        assertFalse(ClientBase.waitForServerUp("127.0.0.1:" + clientPortQp3, CONNECTION_TIMEOUT));
-    }
-
-    @TestBothFipsModes
-    @Timeout(value = 5, unit = TimeUnit.MINUTES)
     public void testOCSP(boolean fipsEnabled) throws Exception {
         System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
 
@@ -929,7 +849,6 @@
     }
 
     @TestBothFipsModes
-    @Timeout(value = 5, unit = TimeUnit.MINUTES)
     public void testCipherSuites(boolean fipsEnabled) throws Exception {
         System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
 
@@ -972,7 +891,6 @@
     }
 
     @TestBothFipsModes
-    @Timeout(value = 5, unit = TimeUnit.MINUTES)
     public void testProtocolVersion(boolean fipsEnabled) throws Exception {
         System.setProperty(quorumX509Util.getFipsModeProperty(), Boolean.toString(fipsEnabled));
         System.setProperty(quorumX509Util.getSslProtocolProperty(), "TLSv1.2");
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/RaceConditionTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/RaceConditionTest.java
@@ -40,7 +40,6 @@
 import org.apache.zookeeper.txn.DeleteTxn;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,7 +59,6 @@
      */
 
     @Test
-    @Timeout(value = 30)
     public void testRaceConditionBetweenLeaderAndAckRequestProcessor() throws Exception {
         mt = startQuorum();
         // get leader
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigLegacyTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigLegacyTest.java
@@ -36,7 +36,6 @@
 import org.apache.zookeeper.test.ReconfigTest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class ReconfigLegacyTest extends QuorumPeerTestBase {
 
@@ -246,7 +245,6 @@
      * @throws Exception
      */
     @Test
-    @Timeout(value = 120)
     public void testRestartZooKeeperServer() throws Exception {
         final int[] clientPorts = new int[SERVER_COUNT];
         StringBuilder sb = new StringBuilder();
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigRollingRestartCompatibilityTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ReconfigRollingRestartCompatibilityTest.java
@@ -37,7 +37,6 @@
 import org.apache.zookeeper.test.ClientBase;
 import org.apache.zookeeper.test.ReconfigTest;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 /**
  * ReconfigRollingRestartCompatibilityTest - we want to make sure that users
@@ -93,7 +92,6 @@
     // Verify no zoo.cfg.dynamic and zoo.cfg.bak files existing locally
     // when reconfig feature flag is off by default.
     @Test
-    @Timeout(value = 60)
     public void testNoLocalDynamicConfigAndBackupFiles() throws InterruptedException, IOException {
         int serverCount = 3;
         String config = generateNewQuorumConfig(serverCount);
@@ -123,7 +121,6 @@
     // 2. After upgrade, start the node.
     // 3. Do this for every node, one at a time.
     @Test
-    @Timeout(value = 60)
     public void testRollingRestartWithoutMembershipChange() throws Exception {
         int serverCount = 3;
         String config = generateNewQuorumConfig(serverCount);
@@ -156,7 +153,6 @@
     // during the process each node has the expected configuration setting pushed
     // via updating local zoo.cfg file.
     @Test
-    @Timeout(value = 90)
     public void testExtendingQuorumWithNewMembers() throws Exception {
         int serverCount = 3;
         String config = generateNewQuorumConfig(serverCount);
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/StandaloneDisabledTest.java
@@ -33,7 +33,6 @@
 import org.apache.zookeeper.test.ClientBase;
 import org.apache.zookeeper.test.ReconfigTest;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class StandaloneDisabledTest extends QuorumPeerTestBase {
 
@@ -55,7 +54,6 @@
      * with just a single server.
      */
     @Test
-    @Timeout(value = 10, unit = TimeUnit.MINUTES)
     public void startSingleServerTest() throws Exception {
         setUpData();
 
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java
@@ -33,7 +33,6 @@
 import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;
 import org.apache.zookeeper.server.quorum.auth.KerberosTestUtils.KerberosConfiguration;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 /*
  * This code is originally from HDFS, see the file name TestMiniKdc there
@@ -46,14 +45,12 @@
 
 
     @Test
-    @Timeout(value = 60)
     public void testMiniKdcStart() {
         MiniKdc kdc = getKdc();
         assertNotSame(0, kdc.getPort());
     }
 
     @Test
-    @Timeout(value = 60)
     public void testKeytabGen() throws Exception {
         MiniKdc kdc = getKdc();
         File workDir = getWorkDir();
@@ -72,7 +69,6 @@
 
 
     @Test
-    @Timeout(value = 60)
     public void testKerberosLogin() throws Exception {
         MiniKdc kdc = getKdc();
         File workDir = getWorkDir();
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java
@@ -35,7 +35,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 /**
  * Rolling upgrade should do in three steps:
@@ -85,7 +84,6 @@
      * peer1 -&gt; quorum.auth.enableSasl=false
      */
     @Test
-    @Timeout(value = 30)
     public void testNullAuthLearnerServer() throws Exception {
         Map<String, String> authConfigs = new HashMap<>();
         authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "false");
@@ -104,7 +102,6 @@
      * peer1 -&gt; quorum.auth.enableSasl=false, quorum.auth.learnerRequireSasl=false, quorum.auth.serverRequireSasl=false
      */
     @Test
-    @Timeout(value = 30)
     public void testAuthLearnerAgainstNullAuthServer() throws Exception {
         Map<String, String> authConfigs = new HashMap<>();
         authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
@@ -123,7 +120,6 @@
      * peer1 -&gt; quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=false, quorum.auth.serverRequireSasl=false
      */
     @Test
-    @Timeout(value = 30)
     public void testAuthLearnerAgainstNoAuthRequiredServer() throws Exception {
         Map<String, String> authConfigs = new HashMap<>();
         authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
@@ -142,7 +138,6 @@
      * peer1 -&gt; quorum.auth.enableSasl=true, quorum.auth.learnerRequireSasl=true, quorum.auth.serverRequireSasl=true
      */
     @Test
-    @Timeout(value = 30)
     public void testAuthLearnerServer() throws Exception {
         Map<String, String> authConfigs = new HashMap<>();
         authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
@@ -173,7 +168,6 @@
      * Now, all the servers are fully upgraded and running in secured mode.
      */
     @Test
-    @Timeout(value = 90)
     public void testRollingUpgrade() throws Exception {
         // Start peer0,1,2 servers with quorum.auth.enableSasl=false and
         // quorum.auth.learnerRequireSasl=false, quorum.auth.serverRequireSasl=false
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java
@@ -37,7 +37,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class QuorumDigestAuthTest extends DigestSecurityTestcase {
 
@@ -79,7 +78,6 @@
      * Test to verify that server is able to start with valid credentials
      */
     @Test
-    @Timeout(value = 30)
     public void testValidCredentials() throws Exception {
         Map<String, String> authConfigs = new HashMap<>();
         authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
@@ -101,7 +99,6 @@
      * when using multiple Quorum / Election addresses
      */
     @Test
-    @Timeout(value = 30)
     public void testValidCredentialsWithMultiAddresses() throws Exception {
         Map<String, String> authConfigs = new HashMap<>();
         authConfigs.put(QuorumAuth.QUORUM_SASL_AUTH_ENABLED, "true");
@@ -124,7 +121,6 @@
      * Quorum will talk each other even if the authentication is not succeeded
      */
     @Test
-    @Timeout(value = 30)
     public void testSaslNotRequiredWithInvalidCredentials() throws Exception {
         Map<String, String> authConfigs = new HashMap<>();
         authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearnerInvalid");
@@ -146,7 +142,6 @@
      * quorum.auth.learnerRequireSasl=true
      */
     @Test
-    @Timeout(value = 30)
     public void testSaslRequiredInvalidCredentials() throws Exception {
         Map<String, String> authConfigs = new HashMap<>();
         authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearnerInvalid");
@@ -167,7 +162,6 @@
      * enabled while enabling quorum server require sasl.
      */
     @Test
-    @Timeout(value = 10)
     public void testEnableQuorumServerRequireSaslWithoutQuorumLearnerRequireSasl() throws Exception {
         Map<String, String> authConfigs = new HashMap<>();
         authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearner");
@@ -196,7 +190,6 @@
      * enabled while enabling quorum server require sasl.
      */
     @Test
-    @Timeout(value = 10)
     public void testEnableQuorumAuthenticationConfigurations() throws Exception {
         Map<String, String> authConfigs = new HashMap<>();
         authConfigs.put(QuorumAuth.QUORUM_LEARNER_SASL_LOGIN_CONTEXT, "QuorumLearner");
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java
@@ -33,7 +33,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class QuorumKerberosAuthTest extends KerberosSecurityTestcase {
 
@@ -110,7 +109,6 @@
      * Test to verify that server is able to start with valid credentials
      */
     @Test
-    @Timeout(value = 120)
     public void testValidCredentials() throws Exception {
         String serverPrincipal = KerberosTestUtils.getServerPrincipal();
         serverPrincipal = serverPrincipal.substring(0, serverPrincipal.lastIndexOf("@"));
@@ -134,7 +132,6 @@
      * when using multiple Quorum / Election addresses
      */
     @Test
-    @Timeout(value = 120)
     public void testValidCredentialsWithMultiAddresses() throws Exception {
         String serverPrincipal = KerberosTestUtils.getServerPrincipal();
         serverPrincipal = serverPrincipal.substring(0, serverPrincipal.lastIndexOf("@"));
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java
@@ -36,7 +36,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class QuorumKerberosHostBasedAuthTest extends KerberosSecurityTestcase {
 
@@ -153,7 +152,6 @@
      * Test to verify that server is able to start with valid credentials
      */
     @Test
-    @Timeout(value = 120)
     public void testValidCredentials() throws Exception {
         String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@"));
         Map<String, String> authConfigs = new HashMap<>();
@@ -176,7 +174,6 @@
      * when using multiple Quorum / Election addresses
      */
     @Test
-    @Timeout(value = 120)
     public void testValidCredentialsWithMultiAddresses() throws Exception {
         String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@"));
         Map<String, String> authConfigs = new HashMap<>();
@@ -198,7 +195,6 @@
      * Test to verify that the bad server connection to the quorum should be rejected.
      */
     @Test
-    @Timeout(value = 120)
     public void testConnectBadServer() throws Exception {
         String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@"));
         Map<String, String> authConfigs = new HashMap<>();
@@ -246,7 +242,6 @@
      * Test to verify that the bad server connection to the quorum should be rejected.
      */
     @Test
-    @Timeout(value = 120)
     public void testConnectHostlessPrincipalBadServer() throws Exception {
         String serverPrincipal = hostServerPrincipal.substring(0, hostServerPrincipal.lastIndexOf("@"));
         Map<String, String> authConfigs = new HashMap<>();
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/JvmPauseMonitorTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/JvmPauseMonitorTest.java
@@ -24,7 +24,6 @@
 import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class JvmPauseMonitorTest {
 
@@ -34,7 +33,6 @@
     private JvmPauseMonitor pauseMonitor;
 
     @Test
-    @Timeout(value = 5)
     public void testJvmPauseMonitorExceedInfoThreshold() throws InterruptedException {
         QuorumPeerConfig qpConfig = mock(QuorumPeerConfig.class);
         when(qpConfig.getJvmPauseSleepTimeMs()).thenReturn(sleepTime);
@@ -52,7 +50,6 @@
     }
 
     @Test
-    @Timeout(value = 5)
     public void testJvmPauseMonitorExceedWarnThreshold() throws InterruptedException {
         QuorumPeerConfig qpConfig = mock(QuorumPeerConfig.class);
         when(qpConfig.getJvmPauseSleepTimeMs()).thenReturn(sleepTime);
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchManagerTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/watch/WatchManagerTest.java
@@ -40,7 +40,6 @@
 import org.apache.zookeeper.server.ServerMetrics;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -229,7 +228,6 @@
      */
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 90)
     public void testAddAndTriggerWatcher(String className) throws IOException {
         IWatchManager manager = getWatchManager(className);
         int paths = 1;
@@ -290,7 +288,6 @@
      */
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 90)
     public void testRemoveWatcherOnPath(String className) throws IOException {
         IWatchManager manager = getWatchManager(className);
         int paths = 10;
@@ -661,7 +658,6 @@
      */
     @ParameterizedTest
     @MethodSource("data")
-    @Timeout(value = 90)
     public void testDeadWatchers(String className) throws IOException {
         System.setProperty("zookeeper.watcherCleanThreshold", "10");
         System.setProperty("zookeeper.watcherCleanIntervalInSeconds", "1");
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java
@@ -32,7 +32,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -188,7 +187,6 @@
     // @see jira issue ZOOKEEPER-706. Test auto reset of a large number of
     // watches which require multiple SetWatches calls.
     @Test
-    @Timeout(value = 14, unit = TimeUnit.MINUTES)
     public void testManyChildWatchersAutoReset() throws Exception {
         zk2 = createClient(watcher2);
 
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsTest.java
@@ -33,7 +33,6 @@
 import org.apache.zookeeper.common.IOUtils;
 import org.apache.zookeeper.common.X509Exception.SSLContextException;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,7 +42,6 @@
 
     /** Test the various four letter words */
     @Test
-    @Timeout(value = 30)
     public void testFourLetterWords() throws Exception {
         verify("ruok", "imok");
         verify("envi", "java.version");
@@ -127,7 +125,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testValidateStatOutput() throws Exception {
         ZooKeeper zk1 = createClient();
         ZooKeeper zk2 = createClient();
@@ -171,7 +168,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testValidateConsOutput() throws Exception {
         ZooKeeper zk1 = createClient();
         ZooKeeper zk2 = createClient();
@@ -193,7 +189,6 @@
     }
 
     @Test
-    @Timeout(value = 60)
     public void testValidateSocketTimeout() throws Exception {
         /**
          * testing positive scenario that even with timeout parameter the
@@ -204,7 +199,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testSetTraceMask() throws Exception {
         String gtmkResp = sendRequest("gtmk");
         assertNotNull(gtmkResp);
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java
@@ -25,7 +25,6 @@
 import org.apache.zookeeper.common.X509Exception.SSLContextException;
 import org.apache.zookeeper.server.command.FourLetterCommands;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,7 +39,6 @@
      * which other tests depend on.).
      */
     @Test
-    @Timeout(value = 30)
     public void testFourLetterWordsAllDisabledByDefault() throws Exception {
         stopServer();
         FourLetterCommands.resetWhiteList();
@@ -65,7 +63,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testFourLetterWordsEnableSomeCommands() throws Exception {
         stopServer();
         FourLetterCommands.resetWhiteList();
@@ -93,7 +90,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testISROEnabledWhenReadOnlyModeEnabled() throws Exception {
         stopServer();
         FourLetterCommands.resetWhiteList();
@@ -105,7 +101,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testFourLetterWordsInvalidConfiguration() throws Exception {
         stopServer();
         FourLetterCommands.resetWhiteList();
@@ -121,7 +116,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testFourLetterWordsEnableAllCommandsThroughAsterisk() throws Exception {
         stopServer();
         FourLetterCommands.resetWhiteList();
@@ -131,7 +125,6 @@
     }
 
     @Test
-    @Timeout(value = 30)
     public void testFourLetterWordsEnableAllCommandsThroughExplicitList() throws Exception {
         stopServer();
         FourLetterCommands.resetWhiteList();
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiOperationTest.java
@@ -61,7 +61,6 @@
 import org.apache.zookeeper.data.Stat;
 import org.apache.zookeeper.server.SyncRequestProcessor;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.slf4j.Logger;
@@ -192,7 +191,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testInvalidPath(boolean useAsync) throws Exception {
         List<Integer> expectedResultCodes = new ArrayList<>();
         expectedResultCodes.add(KeeperException.Code.RUNTIMEINCONSISTENCY.intValue());
@@ -295,7 +293,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testBlankPath(boolean useAsync) throws Exception {
         List<Integer> expectedResultCodes = new ArrayList<>();
         expectedResultCodes.add(KeeperException.Code.RUNTIMEINCONSISTENCY.intValue());
@@ -318,7 +315,6 @@
      */
     @ParameterizedTest
     @ValueSource(booleans = {true, false})
-    @Timeout(value = 90)
     public void testInvalidCreateModeFlag(boolean useAsync) throws Exception {
         List<Integer> expectedResultCodes = new ArrayList<>();
         expectedResultCodes.add(KeeperException.Code.RUNTIMEINCONSISTENCY.intValue());
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/NonRecoverableErrorTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NonRecoverableErrorTest.java
@@ -37,7 +37,6 @@
 import org.apache.zookeeper.server.quorum.QuorumPeerTestBase;
 import org.apache.zookeeper.test.ClientBase.CountdownWatcher;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 /**
  * This class tests the non-recoverable error behavior of quorum server.
@@ -52,7 +51,6 @@
      * writing transaction log), ZooKeeper is still available.
      */
     @Test
-    @Timeout(value = 30)
     public void testZooKeeperServiceAvailableOnLeader() throws Exception {
         int SERVER_COUNT = 3;
         final int[] clientPorts = new int[SERVER_COUNT];
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java
@@ -43,7 +43,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.LoggerFactory;
 
 public class ReadOnlyModeTest extends ZKTestCase {
@@ -67,7 +66,6 @@
      * Test write operations using multi request.
      */
     @Test
-    @Timeout(value = 90)
     public void testMultiTransaction() throws Exception {
         qu.enableLocalSession(true);
         qu.startQuorum();
@@ -111,7 +109,6 @@
      * during read-only mode, then regains a quorum and tries to write again.
      */
     @Test
-    @Timeout(value = 90)
     public void testReadOnlyClient() throws Exception {
         qu.enableLocalSession(true);
         qu.startQuorum();
@@ -165,7 +162,6 @@
      * ConnectedReadOnly state notification.
      */
     @Test
-    @Timeout(value = 90)
     public void testConnectionEvents() throws Exception {
         qu.enableLocalSession(true);
         qu.startQuorum();
@@ -210,7 +206,6 @@
      * the user.
      */
     @Test
-    @Timeout(value = 90)
     public void testSessionEstablishment() throws Exception {
         qu.enableLocalSession(true);
         qu.startQuorum();
@@ -244,7 +239,6 @@
     }
 
     @Test
-    @Timeout(value = 90)
     public void testGlobalSessionInRO() throws Exception {
         qu.startQuorum();
 
@@ -287,7 +281,6 @@
      */
     @SuppressWarnings("deprecation")
     @Test
-    @Timeout(value = 90)
     public void testSeekForRwServer() throws Exception {
         qu.enableLocalSession(true);
         qu.startQuorum();
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigExceptionTest.java
@@ -37,7 +37,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -89,7 +88,6 @@
     }
 
     @Test
-    @Timeout(value = 10)
     public void testReconfigDisabled() throws InterruptedException {
         QuorumPeerConfig.setReconfigEnabled(false);
 
@@ -111,7 +109,6 @@
     }
 
     @Test
-    @Timeout(value = 10)
     public void testReconfigFailWithoutAuth() throws InterruptedException {
         try {
             reconfigPort();
@@ -123,7 +120,6 @@
     }
 
     @Test
-    @Timeout(value = 10)
     public void testReconfigEnabledWithSuperUser() throws InterruptedException {
         try {
             zkAdmin.addAuthInfo("digest", "super:test".getBytes());
@@ -134,7 +130,6 @@
     }
 
     @Test
-    @Timeout(value = 10)
     public void testReconfigFailWithAuthWithNoACL() throws InterruptedException {
         resetZKAdmin();
 
@@ -149,7 +144,6 @@
     }
 
     @Test
-    @Timeout(value = 10)
     public void testReconfigEnabledWithAuthAndWrongACL() throws InterruptedException {
         resetZKAdmin();
 
@@ -168,7 +162,6 @@
     }
 
     @Test
-    @Timeout(value = 10)
     public void testReconfigEnabledWithAuthAndACL() throws InterruptedException {
         resetZKAdmin();
 
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReconfigMisconfigTest.java
@@ -33,7 +33,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -75,7 +74,6 @@
     }
 
     @Test
-    @Timeout(value = 10)
     public void testReconfigFailWithoutSuperuserPasswordConfiguredOnServer() throws InterruptedException {
         // This tests the case where ZK ensemble does not have the super user's password configured.
         // Reconfig should fail as the super user has to be explicitly configured via
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/util/TestCircularBlockingQueue.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/util/TestCircularBlockingQueue.java
@@ -24,7 +24,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 public class TestCircularBlockingQueue {
 
@@ -48,7 +47,6 @@
   }
 
   @Test
-  @Timeout(value = 10)
   public void testCircularBlockingQueueTakeBlock()
       throws InterruptedException, ExecutionException {