diff --git a/CHANGES.txt b/CHANGES.txt
index 26679922b25..b5009aef077 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -153,6 +153,9 @@ Trunk (unreleased changes)
     HADOOP-7285. Refactor the test command to conform to new FsCommand
     class. (Daryn Sharp via todd)
 
+    HADOOP-7289. In ivy.xml, test conf should not extend common conf.
+    (Eric Yang via szetszwo)
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/build.xml b/build.xml
index 5ffffabda1b..26ccfa087ec 100644
--- a/build.xml
+++ b/build.xml
@@ -212,10 +212,10 @@
     <pathelement location="${build.examples}"/>
     <pathelement location="${build.tools}"/>
     <pathelement path="${clover.jar}"/>
+    <path refid="ivy-common.classpath"/>
     <path refid="ivy-test.classpath"/>
     <pathelement location="${build.classes}"/>
     <pathelement location="${test.conf.dir}"/>
-    <path refid="ivy-common.classpath"/>
   </path>
 <!--
   <path id="test.hdfs.classpath">
diff --git a/ivy.xml b/ivy.xml
index 9a40bba9c9a..b0125788801 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -53,7 +53,7 @@
    <conf name="common" extends="runtime,mandatory,httpclient,ftp,jetty,jdiff"
 		      description="common artifacts"/>
     <!--Testing pulls in everything-->
-   <conf name="test" extends="master,common" description="the classpath needed to run tests"/>
+   <conf name="test" extends="master" description="the classpath needed to run tests"/>
 
     <!--Private configurations. -->
 
@@ -219,7 +219,7 @@
     <dependency org="junit"
       name="junit"
       rev="${junit.version}"
-      conf="common->default"/>
+      conf="test->default"/>
     <dependency org="org.apache.rat"
       name="apache-rat-tasks"
       rev="${rats-lib.version}"
@@ -247,7 +247,7 @@
     <dependency org="org.slf4j"
       name="slf4j-api"
       rev="${slf4j-api.version}"
-      conf="common->master"/>
+      conf="common->default"/>
     <dependency org="org.eclipse.jdt"
       name="core"
       rev="${core.version}"
@@ -294,7 +294,7 @@
     <dependency org="org.mockito" 
       name="mockito-all" 
       rev="${mockito-all.version}" 
-      conf="common->default">
+      conf="test->default">
     </dependency> 
     <dependency org="com.jcraft"
       name="jsch"