diff --git a/project/Sbt.scala b/project/Sbt.scala
index bac5b4c5f..1937276df 100644
--- a/project/Sbt.scala
+++ b/project/Sbt.scala
@@ -1,6 +1,5 @@
 // TODO(high): proper incremental xsbt.version.properties generation
 // TODO(low): proper generated API sources caching: doesn't detect output directory change
-// TODO: fix discovery/test
 
 	import sbt._
 	import Keys._
@@ -73,7 +72,7 @@ object Sbt extends Build
 	/***** Intermediate-level Modules *****/
 
 		// Apache Ivy integration
-	lazy val ivySub = baseProject(file("ivy"), "Ivy") dependsOn(interfaceSub, launchInterfaceSub, logSub % "compile;test->test", ioSub % "compile;test->test", launchSub % "test->test") settings(ivy, jsch)
+	lazy val ivySub = baseProject(file("ivy"), "Ivy") dependsOn(interfaceSub, launchInterfaceSub, logSub % "compile;test->test", ioSub % "compile;test->test", launchSub % "test->test") settings(ivy, jsch, httpclient, excludeJUnit)
 		// Runner for uniform test interface
 	lazy val testingSub = baseProject(file("testing"), "Testing") dependsOn(ioSub, classpathSub, logSub) settings(libraryDependencies += "org.scala-tools.testing" % "test-interface" % "0.5")
 
diff --git a/project/Util.scala b/project/Util.scala
index 0be323291..a8990ccc7 100644
--- a/project/Util.scala
+++ b/project/Util.scala
@@ -68,9 +68,11 @@ object Common
 	lazy val jlineDep = "jline" % "jline" % "0.9.94" intransitive()
 	lazy val jline = lib(jlineDep)
 	lazy val ivy = lib("org.apache.ivy" % "ivy" % "2.2.0")
+	lazy val httpclient = lib("commons-httpclient" % "commons-httpclient" % "3.1")
 	lazy val jsch = lib("com.jcraft" % "jsch" % "0.1.31" intransitive() )
 	lazy val sbinary = lib("org.scala-tools.sbinary" %% "sbinary" % "0.4.0" )
 	lazy val scalaCompiler = libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ )
+	lazy val excludeJUnit = ivyXML := <dependencies><exclude org="junit"/></dependencies>
 }
 object Licensed
 {