diff --git a/ivy.xml b/ivy.xml
index 433ff8b9..4c8ae599 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -37,19 +37,17 @@
 	</publications>
 	<dependencies>
 	    <dependency org="ant" name="ant" rev="1.6" conf="default"/>
-		<dependency org="commons-httpclient" name="commons-httpclient" rev="3.0" conf="default,httpclient->runtime,master">
-			<exclude org="junit" name="junit"/>
-		</dependency>
-		<dependency org="commons-cli" name="commons-cli" rev="1.0" conf="default,standalone->runtime,master">
-			<exclude org="junit" name="junit"/>
-		</dependency>
+		<dependency org="commons-httpclient" name="commons-httpclient" rev="3.0" conf="default,httpclient->runtime,master" />
+		<dependency org="commons-cli" name="commons-cli" rev="1.0" conf="default,standalone->runtime,master" />
 		<dependency org="oro" name="oro" rev="2.0.8" conf="default,oro->default"/>
 		<dependency org="commons-vfs" name="commons-vfs" rev="1.0" conf="default,vfs->default" />
 		<dependency org="jsch" name="jsch" rev="0.1.25" conf="default,sftp->default" />
+
 		<!-- Test dependencies -->
 	    <dependency org="ant" name="ant-launcher" rev="1.6" conf="test->default"/>
 	    <dependency org="ant" name="ant-junit" rev="1.6" conf="test->default"/>
 		<dependency org="junit" name="junit" rev="3.8.2" conf="test->default" />
 		<dependency org="commons-lang" name="commons-lang" rev="[1.0,3.0[" conf="test->default" />
+		<exclude org="junit" module="junit" conf="core,default" />
 	</dependencies>
 </ivy-module>