diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java
index 1a88b29b54..9825ea3a19 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/JMSPublisherConsumerTest.java
@@ -154,8 +154,7 @@ public class JMSPublisherConsumerTest {
         }
     }
 
-
-    @Test(timeout = 2000000)
+    @Test(timeout = 20000)
     public void testMultipleThreads() throws Exception {
         String destinationName = "testQueue";
         JmsTemplate publishTemplate = CommonTest.buildJmsTemplateForDestination(false);
diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSTest.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSTest.java
index 1964ce9f64..06bd775d7b 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSTest.java
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/processors/PublishJMSTest.java
@@ -73,7 +73,7 @@ public class PublishJMSTest {
         assertEquals("cooQueue", ((Queue) message.getJMSReplyTo()).getQueueName());
         assertEquals("foo", message.getStringProperty("foo"));
 
-        runner.run(1, true); // Run once just so that we can trigger the shutdown of the Connection Factory
+        runner.run(1, true, false); // Run once just so that we can trigger the shutdown of the Connection Factory
     }
 
     @Test
@@ -111,7 +111,7 @@ public class PublishJMSTest {
         assertEquals("cooQueue", ((Queue) message.getJMSReplyTo()).getQueueName());
         assertEquals("foo", message.getStringProperty("foo"));
 
-        runner.run(1, true); // Run once just so that we can trigger the shutdown of the Connection Factory
+        runner.run(1, true, false); // Run once just so that we can trigger the shutdown of the Connection Factory
     }
 
     @Test