diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Data.db b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Data.db
deleted file mode 100644
index 45300342a7..0000000000
Binary files a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Data.db and /dev/null differ
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Filter.db b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Filter.db
deleted file mode 100644
index 1b5e70883c..0000000000
Binary files a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Filter.db and /dev/null differ
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Index.db b/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Index.db
deleted file mode 100644
index 2cbe31921e..0000000000
Binary files a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Index.db and /dev/null differ
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Data.db b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Data.db
new file mode 100644
index 0000000000..70e64e08a5
Binary files /dev/null and b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Data.db differ
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Filter.db b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Filter.db
new file mode 100644
index 0000000000..7e129e3838
Binary files /dev/null and b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Filter.db differ
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Index.db b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Index.db
new file mode 100644
index 0000000000..5da29149bb
Binary files /dev/null and b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Index.db differ
diff --git a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Statistics.db
similarity index 96%
rename from test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db
rename to test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Statistics.db
index 7231157387..ff68b08e5f 100644
Binary files a/test/data/corrupt-sstables/Keyspace1-Standard3-hd-1-Statistics.db and b/test/data/corrupt-sstables/Keyspace1-Standard3-ia-1-Statistics.db differ
diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java
index d179ff5ee4..c5fc5d7e69 100644
--- a/test/unit/org/apache/cassandra/db/ScrubTest.java
+++ b/test/unit/org/apache/cassandra/db/ScrubTest.java
@@ -182,20 +182,20 @@ public class ScrubTest extends SchemaLoader
          ColumnFamilyStore cfs = table.getColumnFamilyStore(columnFamily);
 
         /*
-         * Code used to generate an outOfOrder sstable. The test must be run without assertions for this to work.
+         * Code used to generate an outOfOrder sstable. The test for out-of-order key in SSTableWriter must also be commented out.
          * The test also assumes an ordered partitioner.
          *
-         * ColumnFamily cf = ColumnFamily.create(TABLE, columnFamily);
-         * cf.addColumn(new Column(ByteBufferUtil.bytes("someName"), ByteBufferUtil.bytes("someValue"), 0L));
+         *  ColumnFamily cf = ColumnFamily.create(TABLE, columnFamily);
+         *  cf.addColumn(new Column(ByteBufferUtil.bytes("someName"), ByteBufferUtil.bytes("someValue"), 0L));
 
-         * SSTableWriter writer = cfs.createCompactionWriter((long)DatabaseDescriptor.getIndexInterval(), new File("."), Collections.<SSTableReader>emptyList());
-         * writer.append(Util.dk("a"), cf);
-         * writer.append(Util.dk("b"), cf);
-         * writer.append(Util.dk("z"), cf);
-         * writer.append(Util.dk("c"), cf);
-         * writer.append(Util.dk("y"), cf);
-         * writer.append(Util.dk("d"), cf);
-         * writer.closeAndOpenReader();
+         *  SSTableWriter writer = cfs.createCompactionWriter((long)DatabaseDescriptor.getIndexInterval(), new File("."), Collections.<SSTableReader>emptyList());
+         *  writer.append(Util.dk("a"), cf);
+         *  writer.append(Util.dk("b"), cf);
+         *  writer.append(Util.dk("z"), cf);
+         *  writer.append(Util.dk("c"), cf);
+         *  writer.append(Util.dk("y"), cf);
+         *  writer.append(Util.dk("d"), cf);
+         *  writer.closeAndOpenReader();
          */
 
         copySSTables(columnFamily);