diff --git a/akka-camel/src/test/scala/CamelServiceManagerSpec.scala b/akka-camel/src/test/scala/CamelServiceManagerTest.scala
similarity index 97%
rename from akka-camel/src/test/scala/CamelServiceManagerSpec.scala
rename to akka-camel/src/test/scala/CamelServiceManagerTest.scala
index 222c1a17c6..fd15ce7154 100644
--- a/akka-camel/src/test/scala/CamelServiceManagerSpec.scala
+++ b/akka-camel/src/test/scala/CamelServiceManagerTest.scala
@@ -8,7 +8,7 @@ import se.scalablesolutions.akka.actor.ActorRegistry
 /**
  * @author Martin Krasser
  */
-class CamelServiceManagerSpec extends WordSpec with BeforeAndAfterAll with MustMatchers {
+class CamelServiceManagerTest extends WordSpec with BeforeAndAfterAll with MustMatchers {
 
   override def afterAll = ActorRegistry.shutdownAll
 
diff --git a/akka-camel/src/test/scala/ConsumerSpec.scala b/akka-camel/src/test/scala/ConsumerTest.scala
similarity index 98%
rename from akka-camel/src/test/scala/ConsumerSpec.scala
rename to akka-camel/src/test/scala/ConsumerTest.scala
index 678ed70057..2a2cc0b11f 100644
--- a/akka-camel/src/test/scala/ConsumerSpec.scala
+++ b/akka-camel/src/test/scala/ConsumerTest.scala
@@ -13,9 +13,9 @@ import se.scalablesolutions.akka.actor._
 /**
  * @author Martin Krasser
  */
-class ConsumerSpec extends WordSpec with BeforeAndAfterAll with MustMatchers {
+class ConsumerTest extends WordSpec with BeforeAndAfterAll with MustMatchers {
   import CamelContextManager.template
-  import ConsumerSpec._
+  import ConsumerTest._
 
   var service: CamelService = _
 
@@ -174,7 +174,7 @@ class ConsumerSpec extends WordSpec with BeforeAndAfterAll with MustMatchers {
   }
 }
 
-object ConsumerSpec {
+object ConsumerTest {
   class TestConsumer(uri: String) extends Actor with Consumer {
     def endpointUri = uri
     protected def receive = {