diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
index 8372e64450c..4f9126c8ad1 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
@@ -293,28 +293,28 @@ public class ResourceHandler extends AbstractHandler
     /* ------------------------------------------------------------ */
     protected Resource getResource(HttpServletRequest request) throws MalformedURLException
     {
-        String servletPath;
         String pathInfo;
         Boolean included = request.getAttribute(Dispatcher.INCLUDE_REQUEST_URI) != null;
         if (included != null && included.booleanValue())
         {
-            servletPath = (String)request.getAttribute(Dispatcher.INCLUDE_SERVLET_PATH);
+            /*
+             On an include there is no servletPath, nor do we want to look for one
+             as the resource handler is outside of the servlet contexts so there is 
+             no special servlet handler that manages this value.
+             we expect a null in Dispatcher.INCLUDE_SERVLET_PATH
+            
+             String servletPath = (String)request.getAttribute(Dispatcher.INCLUDE_SERVLET_PATH);
+             assert servletPath == null;
+            */
             pathInfo = (String)request.getAttribute(Dispatcher.INCLUDE_PATH_INFO);
-            if (servletPath == null)
-            {
-                servletPath = request.getServletPath();
-                pathInfo = request.getPathInfo();
-            }
         }
         else
         {
             included = Boolean.FALSE;
-            servletPath = request.getServletPath();
             pathInfo = request.getPathInfo();
         }
-
-        String pathInContext=URIUtil.addPaths(servletPath,pathInfo);
-        return getResource(pathInContext);
+        
+        return getResource(pathInfo);
     }
 
 
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
index 871bd7da6c6..ce5b326ec01 100644
--- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
+++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
@@ -204,7 +204,6 @@ public class DispatcherTest
     }
     
     @Test
-    @Ignore("failing")
     public void testIncludeToResourceHandler() throws Exception
     {
         _contextHandler.addServlet(DispatchToResourceServlet.class, "/resourceServlet/*");
@@ -230,7 +229,6 @@ public class DispatcherTest
     }
     
     @Test
-    @Ignore("failing")
     public void testWrappedIncludeToResourceHandler() throws Exception
     {
         _contextHandler.addServlet(DispatchToResourceServlet.class, "/resourceServlet/*");