diff --git a/test/app.router.js b/test/app.router.js
index 9e92be3d..c5ff185a 100644
--- a/test/app.router.js
+++ b/test/app.router.js
@@ -128,7 +128,7 @@ describe('app.router', function(){
 
         request(app)
         .get('/user')
-        .expect('Cannot GET /user', done);
+        .expect(404, done);
       })
     })
   })
@@ -186,7 +186,7 @@ describe('app.router', function(){
 
         request(app)
         .get('/user')
-        .expect('Cannot GET /user', done);
+        .expect(404, done);
       })
       
       it('should fail when adding the trailing slash', function(done){
@@ -200,7 +200,7 @@ describe('app.router', function(){
 
         request(app)
         .get('/user/')
-        .expect('Cannot GET /user/', done);
+        .expect(404, done);
       })
     })
   })
@@ -218,6 +218,18 @@ describe('app.router', function(){
       .expect('tj', done);
     })
     
+    it('should match a single segment only', function(done){
+      var app = express();
+
+      app.get('/user/:user', function(req, res){
+        res.end(req.params.user);
+      });
+
+      request(app)
+      .get('/user/tj/edit')
+      .expect(404, done);
+    })
+    
     it('should allow several capture groups', function(done){
       var app = express();
 
diff --git a/test/support/http.js b/test/support/http.js
index faeb5117..97399b86 100644
--- a/test/support/http.js
+++ b/test/support/http.js
@@ -57,7 +57,11 @@ Request.prototype.request = function(method, path){
 
 Request.prototype.expect = function(body, fn){
   this.end(function(res){
-    res.body.should.equal(body);
+    if ('number' == typeof body) {
+      res.statusCode.should.equal(body);
+    } else {
+      res.body.should.equal(body);
+    }
     fn();
   });
 };