diff --git a/lib/shelf_static.dart b/lib/shelf_static.dart
index 28031fb..83944d7 100644
--- a/lib/shelf_static.dart
+++ b/lib/shelf_static.dart
@@ -17,7 +17,7 @@
 
   return (Request request) {
 
-    var segs = [fileSystemPath]..addAll(request.pathSegments);
+    var segs = [fileSystemPath]..addAll(request.requestedUri.pathSegments);
 
     var requestedPath = p.joinAll(segs);
     var file = new File(requestedPath);
@@ -30,7 +30,7 @@
 
     // Do not serve a file outside of the original fileSystemPath
     if (!p.isWithin(fileSystemPath, resolvedPath)) {
-      throw 'Requested path ${request.pathInfo} resolved to $resolvedPath '
+      throw 'Requested path ${request.requestedUri} resolved to $resolvedPath '
           'is not under $fileSystemPath.';
     }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 89ed67e..b7c1c4a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@
 version: 0.0.0-dev
 description: Static file server support for Shelf
 dependencies:
-  shelf: '>=0.3.0 <0.4.0'
+  shelf: '>=0.5.0 <0.6.0'
 dev_dependencies:
   hop: '>=0.30.2 <0.31.0'
-  scheduled_test: '>=0.10.0 <0.11.0'
+  scheduled_test: '>=0.11.0 <0.12.0'
diff --git a/test/test_util.dart b/test/test_util.dart
index a8d48ae..def6bcb 100644
--- a/test/test_util.dart
+++ b/test/test_util.dart
@@ -13,5 +13,5 @@
 Future<Response> makeRequest(Handler handler, String path) =>
     syncFuture(() => handler(_fromPath(path)));
 
-Request _fromPath(String path) => new Request(path, '', 'GET', '', '1.1',
-    Uri.parse('http://localhost' + path), {});
+Request _fromPath(String path) =>
+    new Request('GET', Uri.parse('http://localhost' + path));