diff --git a/akka-camel/src/main/scala/akka/camel/Consumer.scala b/akka-camel/src/main/scala/akka/camel/Consumer.scala
index 0351ce39cb..48382334ab 100644
--- a/akka-camel/src/main/scala/akka/camel/Consumer.scala
+++ b/akka-camel/src/main/scala/akka/camel/Consumer.scala
@@ -4,6 +4,8 @@
 
 package akka.camel
 
+import language.postfixOps
+
 import internal.component.DurationTypeConverter
 import org.apache.camel.model.{ RouteDefinition, ProcessorDefinition }
 
diff --git a/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala b/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
index d52f74f2f6..684ba40b49 100644
--- a/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
+++ b/akka-camel/src/main/scala/akka/camel/internal/component/ActorComponent.scala
@@ -4,6 +4,8 @@
 
 package akka.camel.internal.component
 
+import language.postfixOps
+
 import java.util.{ Map ⇒ JMap }
 
 import org.apache.camel._
diff --git a/akka-camel/src/main/scala/akka/package.scala b/akka-camel/src/main/scala/akka/package.scala
index d3e60ae24f..c97a8e5b64 100644
--- a/akka-camel/src/main/scala/akka/package.scala
+++ b/akka-camel/src/main/scala/akka/package.scala
@@ -4,6 +4,8 @@
 
 package akka
 
+import language.implicitConversions
+
 import org.apache.camel.model.ProcessorDefinition
 
 package object camel {
diff --git a/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala b/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala
index e36a3e1afe..4a110cd154 100644
--- a/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ActivationIntegrationTest.scala
@@ -4,6 +4,8 @@
 
 package akka.camel
 
+import language.postfixOps
+
 import org.scalatest.matchers.MustMatchers
 import akka.util.duration._
 import org.apache.camel.ProducerTemplate
diff --git a/akka-camel/src/test/scala/akka/camel/CamelExchangeAdapterTest.scala b/akka-camel/src/test/scala/akka/camel/CamelExchangeAdapterTest.scala
index 1b08df493c..ca7d57a0aa 100644
--- a/akka-camel/src/test/scala/akka/camel/CamelExchangeAdapterTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/CamelExchangeAdapterTest.scala
@@ -4,6 +4,8 @@
 
 package akka.camel
 
+import language.implicitConversions
+
 import internal.CamelExchangeAdapter
 import org.apache.camel.impl.DefaultExchange
 import org.apache.camel.{ Exchange, ExchangePattern }
diff --git a/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala b/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala
index 5a0d52572f..5cbdcd7a47 100644
--- a/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala
@@ -4,6 +4,9 @@
 
 package akka.camel
 
+import language.postfixOps
+import language.existentials
+
 import akka.actor._
 import org.scalatest.matchers.MustMatchers
 import akka.util.duration._
diff --git a/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala b/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
index a7e5b9e4cb..02af604d8e 100644
--- a/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ProducerFeatureTest.scala
@@ -4,6 +4,8 @@
 
 package akka.camel
 
+import language.postfixOps
+
 import org.apache.camel.{ Exchange, Processor }
 import org.apache.camel.builder.RouteBuilder
 import org.apache.camel.component.mock.MockEndpoint
diff --git a/akka-camel/src/test/scala/akka/camel/ProducerRegistryTest.scala b/akka-camel/src/test/scala/akka/camel/ProducerRegistryTest.scala
index 8355906c80..6e2b78ae6f 100644
--- a/akka-camel/src/test/scala/akka/camel/ProducerRegistryTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/ProducerRegistryTest.scala
@@ -4,6 +4,8 @@
 
 package akka.camel
 
+import language.postfixOps
+
 import org.scalatest.matchers.MustMatchers
 import org.scalatest.WordSpec
 import akka.camel.TestSupport.SharedCamelSystem
diff --git a/akka-camel/src/test/scala/akka/camel/TestSupport.scala b/akka-camel/src/test/scala/akka/camel/TestSupport.scala
index fee20267b1..946075d047 100644
--- a/akka-camel/src/test/scala/akka/camel/TestSupport.scala
+++ b/akka-camel/src/test/scala/akka/camel/TestSupport.scala
@@ -4,6 +4,9 @@
 
 package akka.camel
 
+import language.postfixOps
+import language.implicitConversions
+
 import akka.actor.{ Props, ActorSystem, Actor }
 import akka.util.duration._
 import java.util.concurrent.{ TimeoutException, ExecutionException, TimeUnit }
diff --git a/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala b/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala
index 411aa0b938..471a4e9773 100644
--- a/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/UntypedProducerTest.scala
@@ -4,6 +4,8 @@
 
 package akka.camel
 
+import language.postfixOps
+
 import org.apache.camel.{ Exchange, Processor }
 import org.apache.camel.builder.RouteBuilder
 import org.apache.camel.component.mock.MockEndpoint
diff --git a/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala b/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala
index fef69ec6db..1c16f3d851 100644
--- a/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/internal/ActivationTrackerTest.scala
@@ -1,5 +1,7 @@
 package akka.camel.internal
 
+import language.postfixOps
+
 import org.scalatest.matchers.MustMatchers
 import akka.util.duration._
 import org.scalatest.{ GivenWhenThen, BeforeAndAfterEach, BeforeAndAfterAll, WordSpec }
diff --git a/akka-camel/src/test/scala/akka/camel/internal/component/ActorComponentConfigurationTest.scala b/akka-camel/src/test/scala/akka/camel/internal/component/ActorComponentConfigurationTest.scala
index dd37716295..68ad38d22e 100644
--- a/akka-camel/src/test/scala/akka/camel/internal/component/ActorComponentConfigurationTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/internal/component/ActorComponentConfigurationTest.scala
@@ -4,6 +4,8 @@
 
 package akka.camel.internal.component
 
+import language.postfixOps
+
 import org.scalatest.matchers.MustMatchers
 import akka.util.duration._
 import akka.camel.TestSupport.SharedCamelSystem
diff --git a/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala b/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala
index a0e153fd54..cfc4d36a86 100644
--- a/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala
@@ -4,6 +4,8 @@
 
 package akka.camel.internal.component
 
+import language.postfixOps
+
 import org.scalatest.mock.MockitoSugar
 import org.mockito.Matchers.{ eq ⇒ the, any }
 import org.mockito.Mockito._
diff --git a/akka-camel/src/test/scala/akka/camel/internal/component/DurationConverterTest.scala b/akka-camel/src/test/scala/akka/camel/internal/component/DurationConverterTest.scala
index 53729a0b6f..065fb8c6c9 100644
--- a/akka-camel/src/test/scala/akka/camel/internal/component/DurationConverterTest.scala
+++ b/akka-camel/src/test/scala/akka/camel/internal/component/DurationConverterTest.scala
@@ -4,6 +4,8 @@
 
 package akka.camel.internal.component
 
+import language.postfixOps
+
 import org.scalatest.matchers.MustMatchers
 import akka.util.duration._
 import akka.util.Duration
diff --git a/akka-camel/src/main/scala/akka/camelexamples/ExamplesSupport.scala b/akka-camel/src/test/scala/akka/camelexamples/ExamplesSupport.scala
similarity index 97%
rename from akka-camel/src/main/scala/akka/camelexamples/ExamplesSupport.scala
rename to akka-camel/src/test/scala/akka/camelexamples/ExamplesSupport.scala
index df5b0e5508..3763df3569 100644
--- a/akka-camel/src/main/scala/akka/camelexamples/ExamplesSupport.scala
+++ b/akka-camel/src/test/scala/akka/camelexamples/ExamplesSupport.scala
@@ -4,6 +4,8 @@
 
 package akka.camelexamples
 
+import language.postfixOps
+
 import akka.camel._
 import akka.util.duration._
 import akka.actor.{ Actor, OneForOneStrategy }
diff --git a/akka-camel/src/main/scala/akka/camelexamples/README.txt b/akka-camel/src/test/scala/akka/camelexamples/README.txt
similarity index 100%
rename from akka-camel/src/main/scala/akka/camelexamples/README.txt
rename to akka-camel/src/test/scala/akka/camelexamples/README.txt
diff --git a/akka-camel/src/main/scala/akka/camelexamples/RichString.scala b/akka-camel/src/test/scala/akka/camelexamples/RichString.scala
similarity index 94%
rename from akka-camel/src/main/scala/akka/camelexamples/RichString.scala
rename to akka-camel/src/test/scala/akka/camelexamples/RichString.scala
index 66c844e091..1c4443c465 100644
--- a/akka-camel/src/main/scala/akka/camelexamples/RichString.scala
+++ b/akka-camel/src/test/scala/akka/camelexamples/RichString.scala
@@ -4,6 +4,8 @@
 
 package akka.camelexamples
 
+import language.implicitConversions
+
 import java.io.FileWriter
 
 private[camelexamples] object RichString {
diff --git a/akka-camel/src/main/scala/akka/camelexamples/_1_SimpleConsumer.scala b/akka-camel/src/test/scala/akka/camelexamples/_1_SimpleConsumer.scala
similarity index 100%
rename from akka-camel/src/main/scala/akka/camelexamples/_1_SimpleConsumer.scala
rename to akka-camel/src/test/scala/akka/camelexamples/_1_SimpleConsumer.scala
diff --git a/akka-camel/src/main/scala/akka/camelexamples/_2_SupervisedConsumers.scala b/akka-camel/src/test/scala/akka/camelexamples/_2_SupervisedConsumers.scala
similarity index 100%
rename from akka-camel/src/main/scala/akka/camelexamples/_2_SupervisedConsumers.scala
rename to akka-camel/src/test/scala/akka/camelexamples/_2_SupervisedConsumers.scala
diff --git a/akka-camel/src/main/scala/akka/camelexamples/_3_SimpleActorEndpoint.scala b/akka-camel/src/test/scala/akka/camelexamples/_3_SimpleActorEndpoint.scala
similarity index 100%
rename from akka-camel/src/main/scala/akka/camelexamples/_3_SimpleActorEndpoint.scala
rename to akka-camel/src/test/scala/akka/camelexamples/_3_SimpleActorEndpoint.scala
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index c04f36596f..9188df566e 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -508,7 +508,7 @@ object OSGi {
 
   val agent = exports(Seq("akka.agent.*"))
 
-  val camel = exports(Seq("akka.camel.*", "akka.camelexamples"))
+  val camel = exports(Seq("akka.camel.*"))
 
   val cluster = exports(Seq("akka.cluster.*"))