diff --git a/language-adaptors/rxjava-clojure/build.gradle b/language-adaptors/rxjava-clojure/build.gradle
index 6fb4ea8c30..f2f074540e 100644
--- a/language-adaptors/rxjava-clojure/build.gradle
+++ b/language-adaptors/rxjava-clojure/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'osgi'
 
 dependencies {
     core project(':rxjava-core')
-    compile project(':rxjava-core')
-    compile project(':language-adaptors:codegen')
+    provided project(':rxjava-core')
+    provided project(':language-adaptors:codegen')
     compile 'org.clojure:clojure:1.4.+'
     compile 'clj-http:clj-http:0.6.4' // https://clojars.org/clj-http    
     provided 'junit:junit-dep:4.10'
@@ -35,9 +35,17 @@ eclipse {
   }
 }
 
+tasks.clojureTest { 
+    classpath = classpath + configurations.provided
+}
+
+tasks.compileExamplesClojure { 
+    classpath = classpath + configurations.provided
+}
+
 task createAdaptedObservable(type: JavaExec) { 
     main = 'rx.codegen.ClassPathBasedRunner'
-    classpath = sourceSets.main.runtimeClasspath
+    classpath = sourceSets.main.runtimeClasspath + configurations.provided
     args = ["Clojure", codeGenOutputDir]
 
     inputs.files(sourceSets.main.runtimeClasspath)
@@ -48,7 +56,7 @@ tasks.test {
     dependsOn(createAdaptedObservable)
 
     //Reorders the classpath so that the newly-create Observables win
-    classpath = createAdaptedObservable.outputs.files + sourceSets.test.runtimeClasspath
+    classpath = createAdaptedObservable.outputs.files + configurations.provided + sourceSets.test.runtimeClasspath
 }
 
 tasks.jar {
diff --git a/language-adaptors/rxjava-dynamic/build.gradle b/language-adaptors/rxjava-dynamic/build.gradle
index 18d03a8d9c..4b75e1d308 100644
--- a/language-adaptors/rxjava-dynamic/build.gradle
+++ b/language-adaptors/rxjava-dynamic/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'osgi'
 
 dependencies {
     core project(':rxjava-core')
-    compile project(':rxjava-core')
-    compile project(':language-adaptors:codegen')
+    provided project(':rxjava-core')
+    provided project(':language-adaptors:codegen')
     provided 'junit:junit-dep:4.10'
     provided 'org.mockito:mockito-core:1.8.5'
 }
 
 task createAdaptedObservable(type: JavaExec) {  
     main = 'rx.codegen.ClassPathBasedRunner'
-    classpath = sourceSets.main.runtimeClasspath
+    classpath = sourceSets.main.runtimeClasspath + configurations.provided
     args = ["Dynamic", codeGenOutputDir]
 
     inputs.files(sourceSets.main.runtimeClasspath)
diff --git a/language-adaptors/rxjava-groovy/build.gradle b/language-adaptors/rxjava-groovy/build.gradle
index edb9cb30ea..b1e6168b26 100644
--- a/language-adaptors/rxjava-groovy/build.gradle
+++ b/language-adaptors/rxjava-groovy/build.gradle
@@ -3,16 +3,16 @@ apply plugin: 'osgi'
 
 dependencies {
     core project(':rxjava-core')
-    compile project(':rxjava-core')
-    compile project(':language-adaptors:codegen')
-    groovy 'org.codehaus.groovy:groovy-all:2.+'
+    provided project(':rxjava-core')
+    provided project(':language-adaptors:codegen')
+    compile 'org.codehaus.groovy:groovy-all:2.+'
     provided 'junit:junit-dep:4.10'
     provided 'org.mockito:mockito-core:1.8.5'
 }
 
 task createAdaptedObservable(type: JavaExec) {  
     main = 'rx.codegen.ClassPathBasedRunner'
-    classpath = sourceSets.main.runtimeClasspath
+    classpath = sourceSets.main.runtimeClasspath + configurations.provided
     args = ["Groovy", codeGenOutputDir]
 
     inputs.files(sourceSets.main.runtimeClasspath)
@@ -26,6 +26,10 @@ tasks.test {
     classpath = createAdaptedObservable.outputs.files + sourceSets.test.runtimeClasspath
 }
 
+tasks.compileExamplesGroovy { 
+    classpath = classpath + configurations.provided
+}
+
 tasks.jar { 
     dependsOn(createAdaptedObservable)
 
diff --git a/language-adaptors/rxjava-jruby/build.gradle b/language-adaptors/rxjava-jruby/build.gradle
index d7a0d82d39..4359e242ac 100644
--- a/language-adaptors/rxjava-jruby/build.gradle
+++ b/language-adaptors/rxjava-jruby/build.gradle
@@ -2,8 +2,8 @@ apply plugin: 'osgi'
 
 dependencies {
     core project(':rxjava-core')
-    compile project(':rxjava-core')
-    compile project(':language-adaptors:codegen')
+    provided project(':rxjava-core')
+    provided project(':language-adaptors:codegen')
     compile 'org.jruby:jruby:1.6+'
     provided 'junit:junit-dep:4.10'
     provided 'org.mockito:mockito-core:1.8.5'
@@ -11,7 +11,7 @@ dependencies {
 
 task createAdaptedObservable(type: JavaExec) { 
     main = 'rx.codegen.ClassPathBasedRunner'
-    classpath = sourceSets.main.runtimeClasspath
+    classpath = sourceSets.main.runtimeClasspath + configurations.provided
     args = ["JRuby", codeGenOutputDir]
 
     inputs.files(sourceSets.main.runtimeClasspath)
diff --git a/language-adaptors/rxjava-scala/build.gradle b/language-adaptors/rxjava-scala/build.gradle
index be61f1d846..744d277e93 100644
--- a/language-adaptors/rxjava-scala/build.gradle
+++ b/language-adaptors/rxjava-scala/build.gradle
@@ -21,24 +21,23 @@ sourceSets {
 }
 
 dependencies {
-    // Scala compiler and related tools
-    compile 'org.scala-lang:scala-compiler:2.10+'
     compile 'org.scala-lang:scala-library:2.10+'
 
     compile project(':rxjava-core')
-    compile 'junit:junit-dep:4.10'
-    compile 'org.mockito:mockito-core:1.8.5'
-    compile 'org.scalatest:scalatest_2.10:1.9.1'
+
+    provided 'org.scalatest:scalatest_2.10:1.9.1'
+    provided 'junit:junit-dep:4.10'
+    provided 'org.mockito:mockito-core:1.8.5'
 }
 
 task test(overwrite: true, dependsOn: testClasses) << {
     ant.taskdef(name: 'scalatest',
-            classname: 'org.scalatest.tools.ScalaTestAntTask',
-            classpath: configurations.testRuntime.asPath + ':' + compileScala.destinationDir
-    )
+                classname: 'org.scalatest.tools.ScalaTestAntTask',
+                classpath: configurations.testRuntime.asPath + ':' + compileScala.destinationDir + ":" + configurations.provided.asPath
+               )
     ant.scalatest(runpath: sourceSets.test.output.classesDir,
-            haltonfailure: 'true',
-            fork: 'false') {reporter(type: 'stdout')}
+                  haltonfailure: 'true',
+                  fork: 'false') {reporter(type: 'stdout')}
 }
 
 jar {
diff --git a/rxjava-contrib/rxjava-swing/build.gradle b/rxjava-contrib/rxjava-swing/build.gradle
index 0076915eee..ea863813a2 100644
--- a/rxjava-contrib/rxjava-swing/build.gradle
+++ b/rxjava-contrib/rxjava-swing/build.gradle
@@ -20,8 +20,6 @@ javadoc {
 }
 
 jar {
-    exclude('**/*$UnitTest*')
-
     manifest {
         name = 'rxjava-swing'
         instruction 'Bundle-Vendor', 'Netflix'
diff --git a/rxjava-core/build.gradle b/rxjava-core/build.gradle
index 39232193e8..537aed6686 100644
--- a/rxjava-core/build.gradle
+++ b/rxjava-core/build.gradle
@@ -25,8 +25,10 @@ javadoc {
 }
 
 jar {
+    baseName = "rxjava"
+
     manifest {
-        name = 'rxjava-core'
+        name = 'rxjava'
         instruction 'Bundle-Vendor', 'Netflix'
         instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
         instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*'