diff --git a/sbt/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala b/sbt/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala
index 68a3ae53b..9d60bd1c0 100644
--- a/sbt/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala
+++ b/sbt/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala
@@ -2,13 +2,23 @@ import sbt._
 
 class WebappBuild(info: ProjectInfo) extends DefaultWebProject(info) {
 
-	override def libraryDependencies = if("jetty7".asFile.exists) jetty7Dependencies else jetty6Dependencies
+	override def libraryDependencies =
+		if("jetty7.0".asFile.exists)
+			jetty70Dependencies
+		else if("jetty7.1".asFile.exists)
+			jetty71Dependencies
+		else
+			jetty6Dependencies
+
 	def jetty6Dependencies =
 		Set("org.mortbay.jetty"          % "servlet-api-2.5"         % "6.1.14"  % "provided->default",
 		"org.mortbay.jetty"          % "jetty"                   % "6.1.14"  % "test->default")
-	def jetty7Dependencies =
+	def jetty70Dependencies =
 		Set("javax.servlet" % "servlet-api" % "2.5" % "provided",
 		"org.eclipse.jetty" % "jetty-webapp" % "7.0.1.v20091125" % "test")
+	def jetty71Dependencies =
+		Set("javax.servlet" % "servlet-api" % "2.5" % "provided",
+		"org.eclipse.jetty" % "jetty-webapp" % "7.1.6.v20100715" % "test")
 
 	def indexURL = new java.net.URL("http://localhost:" + jettyPort)
 	def indexFile = new java.io.File("index.html")
diff --git a/sbt/src/sbt-test/web/servlet/test b/sbt/src/sbt-test/web/servlet/test
index 39ebb15bd..f86716523 100644
--- a/sbt/src/sbt-test/web/servlet/test
+++ b/sbt/src/sbt-test/web/servlet/test
@@ -1,4 +1,5 @@
-> ++2.8.0.Beta1
+> set build.scala.versions 2.8.0
+> reload
 
 $ copy-file changes/MyServlet1.scala src/main/scala/test/MyServlet.scala
 > update
@@ -14,8 +15,29 @@ $ copy-file changes/MyServlet2.scala src/main/scala/test/MyServlet.scala
 > jetty-stop
 -> check-page "Hello World 2!"
 
+
 # test that it works with Jetty 7 support
-$ touch jetty7
+$ touch jetty7.0
+> reload
+
+$ copy-file changes/MyServlet1.scala src/main/scala/test/MyServlet.scala
+> update
+> jetty-run
+> check-page "Hello, Scala!"
+
+$ copy-file changes/MyServlet2.scala src/main/scala/test/MyServlet.scala
+
+> prepare-webapp
+> jetty-reload
+> check-page "Hello, Scala 2!"
+
+> jetty-stop
+-> check-page "Hello World 2!"
+
+
+# test that it works with Jetty 7 support
+$ touch jetty7.1
+> reload
 
 $ copy-file changes/MyServlet1.scala src/main/scala/test/MyServlet.scala
 > update