diff --git a/sbt/src/sbt-test/dependency-management/packaging-pom/A.scala b/sbt/src/sbt-test/dependency-management/packaging-pom/A.scala
deleted file mode 100644
index 043d6a0c4..000000000
--- a/sbt/src/sbt-test/dependency-management/packaging-pom/A.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-class A {
- val x = classOf[org.apache.velocity.Template]
-}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/dependency-management/packaging-pom/changes/pkgjar.sbt b/sbt/src/sbt-test/dependency-management/packaging-pom/changes/pkgjar.sbt
deleted file mode 100644
index 452238a57..000000000
--- a/sbt/src/sbt-test/dependency-management/packaging-pom/changes/pkgjar.sbt
+++ /dev/null
@@ -1 +0,0 @@
-libraryDependencies += "org.apache.velocity" % "velocity" % "1.7" intransitive()
\ No newline at end of file
diff --git a/sbt/src/sbt-test/dependency-management/packaging-pom/changes/pkgpom-explicit.sbt b/sbt/src/sbt-test/dependency-management/packaging-pom/changes/pkgpom-explicit.sbt
deleted file mode 100644
index 1c8061659..000000000
--- a/sbt/src/sbt-test/dependency-management/packaging-pom/changes/pkgpom-explicit.sbt
+++ /dev/null
@@ -1 +0,0 @@
-libraryDependencies += "org.apache.velocity" % "velocity" % "1.5" intransitive() jar()
\ No newline at end of file
diff --git a/sbt/src/sbt-test/dependency-management/packaging-pom/changes/pkgpom.sbt b/sbt/src/sbt-test/dependency-management/packaging-pom/changes/pkgpom.sbt
deleted file mode 100644
index e20120f24..000000000
--- a/sbt/src/sbt-test/dependency-management/packaging-pom/changes/pkgpom.sbt
+++ /dev/null
@@ -1 +0,0 @@
-libraryDependencies += "org.apache.velocity" % "velocity" % "1.5" intransitive()
\ No newline at end of file
diff --git a/sbt/src/sbt-test/dependency-management/packaging-pom/common.sbt b/sbt/src/sbt-test/dependency-management/packaging-pom/common.sbt
deleted file mode 100644
index 70ab07db3..000000000
--- a/sbt/src/sbt-test/dependency-management/packaging-pom/common.sbt
+++ /dev/null
@@ -1 +0,0 @@
-ivyPaths := new IvyPaths(baseDirectory.value, Some(target.value / "ivy-cache"))
\ No newline at end of file
diff --git a/sbt/src/sbt-test/dependency-management/packaging-pom/test b/sbt/src/sbt-test/dependency-management/packaging-pom/test
deleted file mode 100644
index 28b3233c0..000000000
--- a/sbt/src/sbt-test/dependency-management/packaging-pom/test
+++ /dev/null
@@ -1,16 +0,0 @@
-# velocity 1.5, packaging=pom, but has a main jar
-#  this verifies that sbt does not retrieve it by default
-$ copy-file changes/pkgpom.sbt dep.sbt
-> reload
--> compile
-
-# with an explicit jar(), sbt should know about it without
-#  needing to ping the repository
-$ copy-file changes/pkgpom-explicit.sbt dep.sbt
-> reload
-> compile
-
-# velocity 1.7, packaging=jar, so this should pull in a main jar as usual
-$ copy-file changes/pkgjar.sbt dep.sbt
-> reload
-> compile
diff --git a/sbt/src/sbt-test/dependency-management/pom-packaging/project/PomTest.scala b/sbt/src/sbt-test/dependency-management/pom-packaging/project/PomTest.scala
new file mode 100644
index 000000000..13e56c32b
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/pom-packaging/project/PomTest.scala
@@ -0,0 +1,24 @@
+import sbt._
+import Keys._
+
+object PomTest extends Build
+{
+	override def settings = super.settings :+ (TaskKey[Unit]("check-pom") <<= checkPom)
+
+	lazy val subJar = Project("sub-jar", file("subJar"))
+	lazy val subWar = Project("sub-war", file("subWar")) settings( warArtifact)
+	lazy val subParent = Project("sub-parent", file("subParent")) settings( publishArtifact in Compile := false )
+
+	def art(p: ProjectReference) = makePom in p
+	def checkPom = (art(subJar), art(subWar), art(subParent)) map { (jar, war, pom) =>
+		checkPackaging(jar, "jar")
+		checkPackaging(war, "war")
+		checkPackaging(pom, "pom")
+	}
+	def checkPackaging(pom: File, expected: String) =
+	{
+		val packaging = (xml.XML.loadFile(pom) \\ "packaging").text
+		if(packaging != expected) error("Incorrect packaging for '" + pom + "'.  Expected '" + expected + "', but got '" + packaging + "'")
+	}
+	def warArtifact = artifact in (Compile, packageBin) ~= { _.copy(`type` = "war", extension = "war") }
+}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/dependency-management/pom-packaging/test b/sbt/src/sbt-test/dependency-management/pom-packaging/test
new file mode 100644
index 000000000..c8edbfbcd
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/pom-packaging/test
@@ -0,0 +1 @@
+> check-pom
\ No newline at end of file