diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index 937818f45..8eb95dc79 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -552,7 +552,7 @@ object ManageDependencies
 	private def extra(artifact: Artifact) =
 	{
 		val ea = artifact.classifier match { case Some(c) => artifact.extra("e:classifier" -> c); case None => artifact }
-		javaMap(artifact.extraAttributes)
+		javaMap(ea.extraAttributes)
 	}
 	private def javaMap(map: Map[String,String]) = if(map.isEmpty) null else wrap.Wrappers.javaMap(map.toSeq : _*)
 	private def toURL(file: File) = file.toURI.toURL
diff --git a/src/sbt-test/dependency-management/classifier/project/build/Test.scala b/src/sbt-test/dependency-management/classifier/project/build/Test.scala
index 5d7f24f5e..b658907e1 100644
--- a/src/sbt-test/dependency-management/classifier/project/build/Test.scala
+++ b/src/sbt-test/dependency-management/classifier/project/build/Test.scala
@@ -2,5 +2,7 @@ import sbt._
 
 class Test(info: ProjectInfo) extends DefaultProject(info)
 {
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
 	val testng = "org.testng" % "testng" % "5.7" classifier "jdk15"
 }
\ No newline at end of file