diff --git a/akka-persistence/akka-persistence-hbase/src/main/scala/HbaseStorageBackend.scala b/akka-persistence/akka-persistence-hbase/src/main/scala/HbaseStorageBackend.scala
index 69c393f455..30873bf036 100644
--- a/akka-persistence/akka-persistence-hbase/src/main/scala/HbaseStorageBackend.scala
+++ b/akka-persistence/akka-persistence-hbase/src/main/scala/HbaseStorageBackend.scala
@@ -25,7 +25,6 @@ import org.apache.hadoop.hbase.util.Bytes
  */
 private[akka] object HbaseStorageBackend extends MapStorageBackend[Array[Byte], Array[Byte]] with VectorStorageBackend[Array[Byte]] with RefStorageBackend[Array[Byte]] with Logging {
 
-  val EMPTY_BYTE_ARRAY = new Array[Byte](0)
   val HBASE_ZOOKEEPER_QUORUM = config.getString("akka.storage.hbase.zookeeper-quorum", "localhost")
   val CONFIGURATION = new HBaseConfiguration
   val REF_TABLE_NAME = "__REF_TABLE"
diff --git a/akka-persistence/akka-persistence-hbase/src/test/scala/HbasePersistentActorSpec.scala b/akka-persistence/akka-persistence-hbase/src/test/scala/HbasePersistentActorSpecTest.scala
similarity index 98%
rename from akka-persistence/akka-persistence-hbase/src/test/scala/HbasePersistentActorSpec.scala
rename to akka-persistence/akka-persistence-hbase/src/test/scala/HbasePersistentActorSpecTest.scala
index 468cd800ce..bad557dcb9 100644
--- a/akka-persistence/akka-persistence-hbase/src/test/scala/HbasePersistentActorSpec.scala
+++ b/akka-persistence/akka-persistence-hbase/src/test/scala/HbasePersistentActorSpecTest.scala
@@ -76,7 +76,7 @@ class PersistentFailerActor extends Transactor {
   }
 }
 
-class HbasePersistentActorSpec extends JUnitSuite with BeforeAndAfterAll {
+class HbasePersistentActorSpecTest extends JUnitSuite with BeforeAndAfterAll {
 
   val testUtil = new HBaseTestingUtility
 
diff --git a/akka-persistence/akka-persistence-hbase/src/test/scala/HbaseStorageSpec.scala b/akka-persistence/akka-persistence-hbase/src/test/scala/HbaseStorageSpecTest.scala
similarity index 99%
rename from akka-persistence/akka-persistence-hbase/src/test/scala/HbaseStorageSpec.scala
rename to akka-persistence/akka-persistence-hbase/src/test/scala/HbaseStorageSpecTest.scala
index 1bad777675..7b38389424 100644
--- a/akka-persistence/akka-persistence-hbase/src/test/scala/HbaseStorageSpec.scala
+++ b/akka-persistence/akka-persistence-hbase/src/test/scala/HbaseStorageSpecTest.scala
@@ -5,7 +5,7 @@ import org.scalatest.matchers.ShouldMatchers
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.BeforeAndAfterEach
 
-class HbaseStorageSpec extends
+class HbaseStorageSpecTest extends
 Spec with
 ShouldMatchers with
 BeforeAndAfterAll with 
diff --git a/akka-persistence/akka-persistence-hbase/src/test/scala/HbaseTicket343Spec.scala b/akka-persistence/akka-persistence-hbase/src/test/scala/HbaseTicket343SpecTest.scala
similarity index 99%
rename from akka-persistence/akka-persistence-hbase/src/test/scala/HbaseTicket343Spec.scala
rename to akka-persistence/akka-persistence-hbase/src/test/scala/HbaseTicket343SpecTest.scala
index d61b82fa87..2e0d446403 100644
--- a/akka-persistence/akka-persistence-hbase/src/test/scala/HbaseTicket343Spec.scala
+++ b/akka-persistence/akka-persistence-hbase/src/test/scala/HbaseTicket343SpecTest.scala
@@ -171,7 +171,7 @@ object Storage {
 import Storage._
 
 @RunWith(classOf[JUnitRunner])
-class HbaseTicket343Spec extends Spec with ShouldMatchers with BeforeAndAfterAll with BeforeAndAfterEach {
+class HbaseTicket343SpecTest extends Spec with ShouldMatchers with BeforeAndAfterAll with BeforeAndAfterEach {
 
   import org.apache.hadoop.hbase.HBaseTestingUtility
   
diff --git a/akka-persistence/akka-persistence-hbase/src/test/scala/SimpleHbaseTest.scala b/akka-persistence/akka-persistence-hbase/src/test/scala/SimpleHbaseSpecTest.scala
similarity index 96%
rename from akka-persistence/akka-persistence-hbase/src/test/scala/SimpleHbaseTest.scala
rename to akka-persistence/akka-persistence-hbase/src/test/scala/SimpleHbaseSpecTest.scala
index f59e3ae55e..883e94b5eb 100644
--- a/akka-persistence/akka-persistence-hbase/src/test/scala/SimpleHbaseTest.scala
+++ b/akka-persistence/akka-persistence-hbase/src/test/scala/SimpleHbaseSpecTest.scala
@@ -10,7 +10,7 @@ import org.junit.Test
 import org.apache.hadoop.hbase.HBaseTestingUtility
 
 @RunWith(classOf[JUnitRunner])
-class PersistenceSpec extends Spec with BeforeAndAfterAll with ShouldMatchers {
+class PersistenceSpecTest extends Spec with BeforeAndAfterAll with ShouldMatchers {
 
   import org.apache.hadoop.hbase.HBaseTestingUtility
 
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 7fdc8d4b53..3284e21663 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -95,7 +95,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   lazy val DISPATCH_VERSION      = "0.7.4"
   lazy val HAWT_DISPATCH_VERSION = "1.0"
   lazy val JACKSON_VERSION       = "1.2.1"
-  lazy val JERSEY_VERSION        = "1.2"
+  lazy val JERSEY_VERSION        = "1.3"
   lazy val MULTIVERSE_VERSION    = "0.6.1"
   lazy val SCALATEST_VERSION     = "1.2-for-scala-2.8.0.final-SNAPSHOT"
   lazy val LOGBACK_VERSION       = "0.9.24"
@@ -543,6 +543,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
     val hbase_test  = Dependencies.hbase_test
     val jetty       = Dependencies.jett_mortbay
     val log4j       = Dependencies.log4j
+
+    override def testOptions = TestFilter((name: String) => name.endsWith("Test")) :: Nil
   }
 
   // -------------------------------------------------------------------------------------------------------------------