diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
index fc33d99c0f..2ba11616e7 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java
@@ -442,14 +442,13 @@ public class TestStandardFlowFileQueue {
         assertNull(flowFile);
     }
 
-
     @Test(timeout = 120000)
     public void testDropSwappedFlowFiles() {
-        for (int i = 1; i <= 210000; i++) {
+        for (int i = 1; i <= 30000; i++) {
             queue.put(new TestFlowFile());
         }
 
-        assertEquals(20, swapManager.swappedOut.size());
+        assertEquals(2, swapManager.swappedOut.size());
         final DropFlowFileStatus status = queue.dropFlowFiles("1", "Unit Test");
         while (status.getState() != DropFlowFileState.COMPLETE) {
             try {
@@ -461,7 +460,7 @@ public class TestStandardFlowFileQueue {
         assertEquals(0, queue.size().getObjectCount());
         assertEquals(0, queue.size().getByteCount());
         assertEquals(0, swapManager.swappedOut.size());
-        assertEquals(20, swapManager.swapInCalledCount);
+        assertEquals(2, swapManager.swapInCalledCount);
     }
 
 
@@ -521,10 +520,6 @@ public class TestStandardFlowFileQueue {
             incompleteSwapFileRecordsToInclude = flowFilesToInclude;
         }
 
-        public void disableIncompleteSwapFileException() {
-            this.incompleteSwapFileRecordsToInclude = -1;
-        }
-
         @Override
         public String swapOut(List<FlowFileRecord> flowFiles, FlowFileQueue flowFileQueue) throws IOException {
             swapOutCalledCount++;