diff --git a/test/unit/org/apache/cassandra/db/compression/CompressionDictionarySchedulerTest.java b/test/unit/org/apache/cassandra/db/compression/CompressionDictionarySchedulerTest.java
index fe9188153d..98a0110e6f 100644
--- a/test/unit/org/apache/cassandra/db/compression/CompressionDictionarySchedulerTest.java
+++ b/test/unit/org/apache/cassandra/db/compression/CompressionDictionarySchedulerTest.java
@@ -43,8 +43,6 @@ public class CompressionDictionarySchedulerTest extends CQLTester
     public void setUp()
     {
         cache = new CompressionDictionaryCache();
-        // Disable compaction to make the sstable sampling deterministic; to avoid excluding sstables get compacted away.
-        disableCompaction(KEYSPACE);
     }
 
     @After
@@ -83,6 +81,7 @@ public class CompressionDictionarySchedulerTest extends CQLTester
         scheduler = new CompressionDictionaryScheduler(KEYSPACE, table, cache, true);
 
         ColumnFamilyStore cfs = Keyspace.open(keyspace()).getColumnFamilyStore(table);
+        cfs.disableAutoCompaction();
         CompressionDictionaryManager manager = cfs.compressionDictionaryManager();
 
         createSSTables();