diff --git a/test/distributed/org/apache/cassandra/distributed/mock/nodetool/InternalNodeProbe.java b/test/distributed/org/apache/cassandra/distributed/mock/nodetool/InternalNodeProbe.java
index a328cc6209..21c73c22ce 100644
--- a/test/distributed/org/apache/cassandra/distributed/mock/nodetool/InternalNodeProbe.java
+++ b/test/distributed/org/apache/cassandra/distributed/mock/nodetool/InternalNodeProbe.java
@@ -34,6 +34,7 @@ import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.ColumnFamilyStoreMBean;
 import org.apache.cassandra.db.Keyspace;
 import org.apache.cassandra.db.compaction.CompactionManager;
+import org.apache.cassandra.db.compaction.CompactionManagerMBean;
 import org.apache.cassandra.db.compression.CompressionDictionaryManagerMBean;
 import org.apache.cassandra.gms.FailureDetector;
 import org.apache.cassandra.gms.FailureDetectorMBean;
@@ -187,7 +188,7 @@ public class InternalNodeProbe extends NodeProbe
             registerMBean(AccordOperationsMBean.class, AccordOperations.instance);
             registerMBean(MessagingServiceMBean.class, MessagingService.instance());
             registerMBean(StreamManagerMBean.class, StreamManager.instance);
-            registerMBean(CompactionManager.class, CompactionManager.instance);
+            registerMBean(CompactionManagerMBean.class, CompactionManager.instance);
             registerMBean(FailureDetectorMBean.class, (FailureDetectorMBean) FailureDetector.instance);
             registerMBean(CacheServiceMBean.class, CacheService.instance);
             registerMBean(StorageProxyMBean.class, StorageProxy.instance);
diff --git a/test/distributed/org/apache/cassandra/distributed/test/NodeToolTest.java b/test/distributed/org/apache/cassandra/distributed/test/NodeToolTest.java
index f85a0efe4f..6960ca24db 100644
--- a/test/distributed/org/apache/cassandra/distributed/test/NodeToolTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/NodeToolTest.java
@@ -27,6 +27,7 @@ import org.junit.Test;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.distributed.Cluster;
+import org.apache.cassandra.distributed.api.ConsistencyLevel;
 import org.apache.cassandra.distributed.api.ICluster;
 import org.apache.cassandra.distributed.api.IInvokableInstance;
 import org.apache.cassandra.distributed.api.NodeToolResult;
@@ -141,6 +142,24 @@ public class NodeToolTest extends TestBaseImpl
         }
     }
 
+    @Test
+    public void testCompactionCommandsThroughMockProbe()
+    {
+        String table = "compaction_history_tbl";
+        CLUSTER.schemaChange("CREATE TABLE " + KEYSPACE + '.' + table + " (k int PRIMARY KEY, v int)");
+        assertEquals(0, NODE.nodetool("disableautocompaction", KEYSPACE));
+        for (int i = 0; i < 2; i++)
+        {
+            CLUSTER.coordinator(1).execute("INSERT INTO " + KEYSPACE + '.' + table + " (k, v) VALUES (?, ?)",
+                                           ConsistencyLevel.ONE, i, i);
+            NODE.flush(KEYSPACE);
+        }
+        NODE.forceCompact(KEYSPACE, table);
+
+        NODE.nodetoolResult("compactionhistory").asserts().success().stdoutContains(table);
+        NODE.nodetoolResult("stop", "COMPACTION").asserts().success();
+    }
+
     @Test
     public void testVersionIncludesGitSHAWhenVerbose() throws Throwable
     {