diff --git a/test/data/legacy-commitlog/2.2-lz4/CommitLog-5-1438186885380.log b/test/data/legacy-commitlog/2.2-lz4/CommitLog-5-1438186885380.log
new file mode 100644
index 0000000000..b98304aff4
Binary files /dev/null and b/test/data/legacy-commitlog/2.2-lz4/CommitLog-5-1438186885380.log differ
diff --git a/test/data/legacy-commitlog/2.2-lz4/CommitLog-5-1438186885381.log b/test/data/legacy-commitlog/2.2-lz4/CommitLog-5-1438186885381.log
new file mode 100644
index 0000000000..adac94f066
Binary files /dev/null and b/test/data/legacy-commitlog/2.2-lz4/CommitLog-5-1438186885381.log differ
diff --git a/test/data/legacy-commitlog/2.2-lz4/hash.txt b/test/data/legacy-commitlog/2.2-lz4/hash.txt
new file mode 100644
index 0000000000..20aa6e5ab7
--- /dev/null
+++ b/test/data/legacy-commitlog/2.2-lz4/hash.txt
@@ -0,0 +1,5 @@
+#CommitLog upgrade test, version 2.2.0-SNAPSHOT
+#Wed Jul 29 19:21:31 EEST 2015
+cells=6052
+hash=1274136076
+cfid=dc32ce20-360d-11e5-826c-afadad37221d
diff --git a/test/data/legacy-commitlog/2.2-snappy/CommitLog-5-1438186915514.log b/test/data/legacy-commitlog/2.2-snappy/CommitLog-5-1438186915514.log
new file mode 100644
index 0000000000..e69dfb7c84
Binary files /dev/null and b/test/data/legacy-commitlog/2.2-snappy/CommitLog-5-1438186915514.log differ
diff --git a/test/data/legacy-commitlog/2.2-snappy/CommitLog-5-1438186915515.log b/test/data/legacy-commitlog/2.2-snappy/CommitLog-5-1438186915515.log
new file mode 100644
index 0000000000..3e06675824
Binary files /dev/null and b/test/data/legacy-commitlog/2.2-snappy/CommitLog-5-1438186915515.log differ
diff --git a/test/data/legacy-commitlog/2.2-snappy/hash.txt b/test/data/legacy-commitlog/2.2-snappy/hash.txt
new file mode 100644
index 0000000000..f3dd72e47f
--- /dev/null
+++ b/test/data/legacy-commitlog/2.2-snappy/hash.txt
@@ -0,0 +1,5 @@
+#CommitLog upgrade test, version 2.2.0-SNAPSHOT
+#Wed Jul 29 19:22:01 EEST 2015
+cells=6051
+hash=881633109
+cfid=ee2fe860-360d-11e5-951c-afadad37221d
diff --git a/test/data/legacy-commitlog/2.2/CommitLog-5-1438186815314.log b/test/data/legacy-commitlog/2.2/CommitLog-5-1438186815314.log
new file mode 100644
index 0000000000..5032519c9b
Binary files /dev/null and b/test/data/legacy-commitlog/2.2/CommitLog-5-1438186815314.log differ
diff --git a/test/data/legacy-commitlog/2.2/CommitLog-5-1438186815315.log b/test/data/legacy-commitlog/2.2/CommitLog-5-1438186815315.log
new file mode 100644
index 0000000000..34a02fe696
Binary files /dev/null and b/test/data/legacy-commitlog/2.2/CommitLog-5-1438186815315.log differ
diff --git a/test/data/legacy-commitlog/2.2/hash.txt b/test/data/legacy-commitlog/2.2/hash.txt
new file mode 100644
index 0000000000..64f9dbbfa8
--- /dev/null
+++ b/test/data/legacy-commitlog/2.2/hash.txt
@@ -0,0 +1,5 @@
+#CommitLog upgrade test, version 2.2.0-SNAPSHOT
+#Wed Jul 29 19:20:21 EEST 2015
+cells=6366
+hash=-802535821
+cfid=b28a7000-360d-11e5-ae92-afadad37221d
diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java
index d8784d9faa..7fd3943052 100644
--- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java
+++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java
@@ -68,6 +68,24 @@ public class CommitLogUpgradeTest
         testRestore(DATA_DIR + "2.1");
     }
 
+    @Test
+    public void test22() throws Exception
+    {
+        testRestore(DATA_DIR + "2.2");
+    }
+
+    @Test
+    public void test22_LZ4() throws Exception
+    {
+        testRestore(DATA_DIR + "2.2-lz4");
+    }
+
+    @Test
+    public void test22_Snappy() throws Exception
+    {
+        testRestore(DATA_DIR + "2.2-snappy");
+    }
+
     @BeforeClass
     static public void initialize() throws FileNotFoundException, IOException, InterruptedException
     {