diff --git a/presto-main/src/test/java/io/prestosql/operator/TestAssignUniqueIdOperator.java b/presto-main/src/test/java/io/prestosql/operator/TestAssignUniqueIdOperator.java
index d7f41c70e..5f382b410 100644
--- a/presto-main/src/test/java/io/prestosql/operator/TestAssignUniqueIdOperator.java
+++ b/presto-main/src/test/java/io/prestosql/operator/TestAssignUniqueIdOperator.java
@@ -75,6 +75,7 @@ public class TestAssignUniqueIdOperator
         assertEquals(SnapshotTestUtil.toSimpleSnapshotMapping(snapshot), createExpectedMapping());
         assertEquals(output.getPositionCount(), 9);
         assertEquals(output.getChannelCount(), 2);
+        operator.close();
     }
 
     private Map<String, Object> createExpectedMapping()
diff --git a/presto-main/src/test/java/io/prestosql/operator/TestEnforceSingleRowOperator.java b/presto-main/src/test/java/io/prestosql/operator/TestEnforceSingleRowOperator.java
index ea1b1e72b..02fd6cc72 100644
--- a/presto-main/src/test/java/io/prestosql/operator/TestEnforceSingleRowOperator.java
+++ b/presto-main/src/test/java/io/prestosql/operator/TestEnforceSingleRowOperator.java
@@ -85,6 +85,7 @@ public class TestEnforceSingleRowOperator
         }
 
         assertTrue(caught, "Operator didn't catch input of position count 2.");
+        operator.close();
     }
 
     private Map<String, Object> createExpectedMapping()
diff --git a/presto-main/src/test/java/io/prestosql/operator/dynamicfilter/TestCrossRegionDynamicFilterOperator.java b/presto-main/src/test/java/io/prestosql/operator/dynamicfilter/TestCrossRegionDynamicFilterOperator.java
index 16f4ce3fe..91598068e 100644
--- a/presto-main/src/test/java/io/prestosql/operator/dynamicfilter/TestCrossRegionDynamicFilterOperator.java
+++ b/presto-main/src/test/java/io/prestosql/operator/dynamicfilter/TestCrossRegionDynamicFilterOperator.java
@@ -84,6 +84,7 @@ public class TestCrossRegionDynamicFilterOperator
         operator.addInput(pages.get(1));
         Page page2 = operator.getOutput();
         assertEquals(page2, pages.get(1));
+        operator.close();
     }
 
     @Test
@@ -109,6 +110,7 @@ public class TestCrossRegionDynamicFilterOperator
         Block block = page.getBlock(0).getLoadedBlock();
         String nativeValue = TypeUtils.readNativeValueForDynamicFilter(types.get(0), block, 0);
         assertEquals(nativeValue, "10001");
+        operator.close();
     }
 
     @Test
@@ -132,6 +134,7 @@ public class TestCrossRegionDynamicFilterOperator
 
         Page page = operator.getOutput();
         assertEquals(page.getPositionCount(), 0);
+        operator.close();
     }
 
     private CrossRegionDynamicFilterOperator createBloomFilterOperator(String queryId, DynamicFilterCacheManager dynamicFilterCacheManager)
diff --git a/presto-memory/src/main/java/io/prestosql/plugin/memory/data/MemoryTableManager.java b/presto-memory/src/main/java/io/prestosql/plugin/memory/data/MemoryTableManager.java
index 08e034d34..28f85a274 100644
--- a/presto-memory/src/main/java/io/prestosql/plugin/memory/data/MemoryTableManager.java
+++ b/presto-memory/src/main/java/io/prestosql/plugin/memory/data/MemoryTableManager.java
@@ -542,6 +542,7 @@ public class MemoryTableManager
     public long getAllTablesDiskByteUsage() throws IOException
     {
         long totalBytes = 0L;
+        validateSpillRoot();
         for (long id : tables.keySet()) {
             long diskUsageSize = Files.walk(spillRoot.resolve(String.valueOf(id)))
                     .filter(p -> p.toFile().isFile())